diff --git a/.gitignore b/.gitignore
index a2bd613..e6dbc52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 /vendor/
 .idea
-/interfaces/
 .phpunit.result.cache
 .phpdoc
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 3867f25..11741d3 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,8 @@
     "grpc/grpc": "^v1.30.0",
     "ext-grpc": "*",
     "ext-protobuf": "*",
-    "amphp/http-server": "^2.1"
+    "amphp/http-server": "^2.1",
+    "amphp/parallel": "^1.4"
   },
   "require-dev": {
     "ext-xdebug": "*",
diff --git a/composer.lock b/composer.lock
index 068c83e..8466afa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "599673170399a564983f5354442f1c02",
+    "content-hash": "f7e26681b8f0d686391d2bb8ac1d2508",
     "packages": [
         {
             "name": "amphp/amp",
@@ -524,6 +524,74 @@
             },
             "time": "2020-06-20T14:40:33+00:00"
         },
+        {
+            "name": "amphp/parallel",
+            "version": "v1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/parallel.git",
+                "reference": "2c1039bf7ca137eae4d954b14c09a7535d7d4e1c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/parallel/zipball/2c1039bf7ca137eae4d954b14c09a7535d7d4e1c",
+                "reference": "2c1039bf7ca137eae4d954b14c09a7535d7d4e1c",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^2",
+                "amphp/byte-stream": "^1.6.1",
+                "amphp/parser": "^1",
+                "amphp/process": "^1",
+                "amphp/serialization": "^1",
+                "amphp/sync": "^1.0.1",
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "dev-master",
+                "amphp/phpunit-util": "^1.1",
+                "phpunit/phpunit": "^8 || ^7"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Amp\\Parallel\\": "lib"
+                },
+                "files": [
+                    "lib/Context/functions.php",
+                    "lib/Sync/functions.php",
+                    "lib/Worker/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Stephen Coakley",
+                    "email": "me@stephencoakley.com"
+                }
+            ],
+            "description": "Parallel processing component for Amp.",
+            "homepage": "https://github.com/amphp/parallel",
+            "keywords": [
+                "async",
+                "asynchronous",
+                "concurrent",
+                "multi-processing",
+                "multi-threading"
+            ],
+            "support": {
+                "issues": "https://github.com/amphp/parallel/issues",
+                "source": "https://github.com/amphp/parallel/tree/master"
+            },
+            "time": "2020-04-27T15:12:37+00:00"
+        },
         {
             "name": "amphp/parser",
             "version": "v1.0.0",
diff --git a/contracts b/contracts
index 157a925..1f4b245 160000
--- a/contracts
+++ b/contracts
@@ -1 +1 @@
-Subproject commit 157a925dc367f9a2bce2c588517e0fb7da8e52a2
+Subproject commit 1f4b24567d7d81c1a1e0da373037588247c7ad95
diff --git a/docs/classes/Nitric-Api-AbstractClient.html b/docs/classes/Nitric-Api-AbstractClient.html
index 40b17a7..474d690 100644
--- a/docs/classes/Nitric-Api-AbstractClient.html
+++ b/docs/classes/Nitric-Api-AbstractClient.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -110,7 +111,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">64</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class AbstractClient, provides common client class functionality and configuration.</p>
 
@@ -200,7 +202,8 @@ <h4 class="phpdocumentor-element__name" id="constant_SERVICE_BIND">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">66</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-signature phpdocumentor-code ">
@@ -243,7 +246,8 @@ <h4 class="phpdocumentor-element__name" id="property_hostname">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">67</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -276,7 +280,8 @@ <h4 class="phpdocumentor-element__name" id="property_opts">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">68</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -313,7 +318,8 @@ <h4 class="phpdocumentor-element__name" id="method___construct">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">70</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -345,7 +351,8 @@ <h4 class="phpdocumentor-element__name" id="method_classFromStruct">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">90</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -388,7 +395,8 @@ <h4 class="phpdocumentor-element__name" id="method_structFromClass">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">79</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -431,7 +439,8 @@ <h4 class="phpdocumentor-element__name" id="method_okOrThrow">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">108</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Check the status returned from an autogenerate gRPC client call. If any status other than OK is detected, throw
 the corresponding exception type.</p>
@@ -462,6 +471,68 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
 </article>
             </section>
 
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -486,5 +557,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-Event.html b/docs/classes/Nitric-Api-Event.html
index defd0fc..ae68699 100644
--- a/docs/classes/Nitric-Api-Event.html
+++ b/docs/classes/Nitric-Api-Event.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -110,7 +111,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Event.php"><a href="files/nitric-api-event.html"><abbr title="Nitric/Api/Event.php">Event.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">28</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class Event represents an event, sent via topics and subscriptions.</p>
 
@@ -241,7 +243,8 @@ <h4 class="phpdocumentor-element__name" id="property_id">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Event.php"><a href="files/nitric-api-event.html"><abbr title="Nitric/Api/Event.php">Event.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">30</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -274,7 +277,8 @@ <h4 class="phpdocumentor-element__name" id="property_payload">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Event.php"><a href="files/nitric-api-event.html"><abbr title="Nitric/Api/Event.php">Event.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">31</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -307,7 +311,8 @@ <h4 class="phpdocumentor-element__name" id="property_payloadType">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Event.php"><a href="files/nitric-api-event.html"><abbr title="Nitric/Api/Event.php">Event.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">32</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -344,7 +349,8 @@ <h4 class="phpdocumentor-element__name" id="method___construct">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Event.php"><a href="files/nitric-api-event.html"><abbr title="Nitric/Api/Event.php">Event.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">34</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -403,7 +409,8 @@ <h4 class="phpdocumentor-element__name" id="method_getId">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Event.php"><a href="files/nitric-api-event.html"><abbr title="Nitric/Api/Event.php">Event.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">44</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -434,7 +441,8 @@ <h4 class="phpdocumentor-element__name" id="method_getPayload">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Event.php"><a href="files/nitric-api-event.html"><abbr title="Nitric/Api/Event.php">Event.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">60</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -465,7 +473,8 @@ <h4 class="phpdocumentor-element__name" id="method_getPayloadType">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Event.php"><a href="files/nitric-api-event.html"><abbr title="Nitric/Api/Event.php">Event.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">76</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -496,7 +505,8 @@ <h4 class="phpdocumentor-element__name" id="method_setId">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Event.php"><a href="files/nitric-api-event.html"><abbr title="Nitric/Api/Event.php">Event.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">52</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -537,7 +547,8 @@ <h4 class="phpdocumentor-element__name" id="method_setPayload">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Event.php"><a href="files/nitric-api-event.html"><abbr title="Nitric/Api/Event.php">Event.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">68</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -578,7 +589,8 @@ <h4 class="phpdocumentor-element__name" id="method_setPayloadType">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Event.php"><a href="files/nitric-api-event.html"><abbr title="Nitric/Api/Event.php">Event.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">84</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -607,6 +619,68 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
 </article>
             </section>
 
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -631,5 +705,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-EventClient.html b/docs/classes/Nitric-Api-EventClient.html
index 42e90f4..8724c6c 100644
--- a/docs/classes/Nitric-Api-EventClient.html
+++ b/docs/classes/Nitric-Api-EventClient.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -113,7 +114,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/EventClient.php"><a href="files/nitric-api-eventclient.html"><abbr title="Nitric/Api/EventClient.php">EventClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">36</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class EventClient provides a client for the Nitric Event Service.</p>
 
@@ -255,7 +257,8 @@ <h4 class="phpdocumentor-element__name" id="constant_SERVICE_BIND">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">66</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-signature phpdocumentor-code ">
@@ -298,7 +301,8 @@ <h4 class="phpdocumentor-element__name" id="property_hostname">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">67</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -331,7 +335,8 @@ <h4 class="phpdocumentor-element__name" id="property_opts">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">68</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -364,7 +369,8 @@ <h4 class="phpdocumentor-element__name" id="property_client">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/EventClient.php"><a href="files/nitric-api-eventclient.html"><abbr title="Nitric/Api/EventClient.php">EventClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">38</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -401,7 +407,8 @@ <h4 class="phpdocumentor-element__name" id="method___construct">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/EventClient.php"><a href="files/nitric-api-eventclient.html"><abbr title="Nitric/Api/EventClient.php">EventClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">45</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">EventClient constructor.</p>
 
@@ -445,7 +452,8 @@ <h4 class="phpdocumentor-element__name" id="method_classFromStruct">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">90</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -488,7 +496,8 @@ <h4 class="phpdocumentor-element__name" id="method_publish">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/EventClient.php"><a href="files/nitric-api-eventclient.html"><abbr title="Nitric/Api/EventClient.php">EventClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">67</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Publish an event/message to a topic, which can be subscribed to by other services.</p>
 
@@ -577,7 +586,8 @@ <h4 class="phpdocumentor-element__name" id="method_structFromClass">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">79</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -620,7 +630,8 @@ <h4 class="phpdocumentor-element__name" id="method_okOrThrow">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">108</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Check the status returned from an autogenerate gRPC client call. If any status other than OK is detected, throw
 the corresponding exception type.</p>
@@ -651,6 +662,68 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
 </article>
             </section>
 
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -675,5 +748,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-Exception-AbortedException.html b/docs/classes/Nitric-Api-Exception-AbortedException.html
index 293b1c3..c5fa705 100644
--- a/docs/classes/Nitric-Api-Exception-AbortedException.html
+++ b/docs/classes/Nitric-Api-Exception-AbortedException.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -115,7 +116,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Exception/AbortedException.php"><a href="files/nitric-api-exception-abortedexception.html"><abbr title="Nitric/Api/Exception/AbortedException.php">AbortedException.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class AbortedException</p>
 
@@ -135,6 +137,68 @@ <h2 class="phpdocumentor-content__title">
         
 
         
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -159,5 +223,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-Exception-AlreadyExistsException.html b/docs/classes/Nitric-Api-Exception-AlreadyExistsException.html
index e25d6ce..19d576e 100644
--- a/docs/classes/Nitric-Api-Exception-AlreadyExistsException.html
+++ b/docs/classes/Nitric-Api-Exception-AlreadyExistsException.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -115,7 +116,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Exception/AlreadyExistsException.php"><a href="files/nitric-api-exception-alreadyexistsexception.html"><abbr title="Nitric/Api/Exception/AlreadyExistsException.php">AlreadyExistsException.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class AlreadyExistsException</p>
 
@@ -135,6 +137,68 @@ <h2 class="phpdocumentor-content__title">
         
 
         
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -159,5 +223,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-Exception-CancelledException.html b/docs/classes/Nitric-Api-Exception-CancelledException.html
index 8a28888..441a34e 100644
--- a/docs/classes/Nitric-Api-Exception-CancelledException.html
+++ b/docs/classes/Nitric-Api-Exception-CancelledException.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -115,7 +116,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Exception/CancelledException.php"><a href="files/nitric-api-exception-cancelledexception.html"><abbr title="Nitric/Api/Exception/CancelledException.php">CancelledException.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class CancelledException</p>
 
@@ -135,6 +137,68 @@ <h2 class="phpdocumentor-content__title">
         
 
         
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -159,5 +223,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-Exception-DataLossException.html b/docs/classes/Nitric-Api-Exception-DataLossException.html
index 5b50752..5cc938a 100644
--- a/docs/classes/Nitric-Api-Exception-DataLossException.html
+++ b/docs/classes/Nitric-Api-Exception-DataLossException.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -115,7 +116,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Exception/DataLossException.php"><a href="files/nitric-api-exception-datalossexception.html"><abbr title="Nitric/Api/Exception/DataLossException.php">DataLossException.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class DataLossException</p>
 
@@ -135,6 +137,68 @@ <h2 class="phpdocumentor-content__title">
         
 
         
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -159,5 +223,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-Exception-DeadlineExceededException.html b/docs/classes/Nitric-Api-Exception-DeadlineExceededException.html
index 82cc22e..e45c55d 100644
--- a/docs/classes/Nitric-Api-Exception-DeadlineExceededException.html
+++ b/docs/classes/Nitric-Api-Exception-DeadlineExceededException.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -115,7 +116,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Exception/DeadlineExceededException.php"><a href="files/nitric-api-exception-deadlineexceededexception.html"><abbr title="Nitric/Api/Exception/DeadlineExceededException.php">DeadlineExceededException.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class DeadlineExceededException</p>
 
@@ -135,6 +137,68 @@ <h2 class="phpdocumentor-content__title">
         
 
         
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -159,5 +223,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-Exception-FailedPreconditionException.html b/docs/classes/Nitric-Api-Exception-FailedPreconditionException.html
index a896e36..e259c74 100644
--- a/docs/classes/Nitric-Api-Exception-FailedPreconditionException.html
+++ b/docs/classes/Nitric-Api-Exception-FailedPreconditionException.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -115,7 +116,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Exception/FailedPreconditionException.php"><a href="files/nitric-api-exception-failedpreconditionexception.html"><abbr title="Nitric/Api/Exception/FailedPreconditionException.php">FailedPreconditionException.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class FailedPreconditionException</p>
 
@@ -135,6 +137,68 @@ <h2 class="phpdocumentor-content__title">
         
 
         
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -159,5 +223,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-Exception-InternalException.html b/docs/classes/Nitric-Api-Exception-InternalException.html
index afdd62a..9fe294e 100644
--- a/docs/classes/Nitric-Api-Exception-InternalException.html
+++ b/docs/classes/Nitric-Api-Exception-InternalException.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -115,7 +116,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Exception/InternalException.php"><a href="files/nitric-api-exception-internalexception.html"><abbr title="Nitric/Api/Exception/InternalException.php">InternalException.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class InternalException</p>
 
@@ -135,6 +137,68 @@ <h2 class="phpdocumentor-content__title">
         
 
         
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -159,5 +223,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-Exception-InvalidArgumentException.html b/docs/classes/Nitric-Api-Exception-InvalidArgumentException.html
index 17f0e36..c97259f 100644
--- a/docs/classes/Nitric-Api-Exception-InvalidArgumentException.html
+++ b/docs/classes/Nitric-Api-Exception-InvalidArgumentException.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -115,7 +116,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Exception/InvalidArgumentException.php"><a href="files/nitric-api-exception-invalidargumentexception.html"><abbr title="Nitric/Api/Exception/InvalidArgumentException.php">InvalidArgumentException.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class InvalidArgumentException</p>
 
@@ -135,6 +137,68 @@ <h2 class="phpdocumentor-content__title">
         
 
         
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -159,5 +223,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-Exception-NotFoundException.html b/docs/classes/Nitric-Api-Exception-NotFoundException.html
index 88c7990..eb1241e 100644
--- a/docs/classes/Nitric-Api-Exception-NotFoundException.html
+++ b/docs/classes/Nitric-Api-Exception-NotFoundException.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -115,7 +116,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Exception/NotFoundException.php"><a href="files/nitric-api-exception-notfoundexception.html"><abbr title="Nitric/Api/Exception/NotFoundException.php">NotFoundException.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class NotFoundException</p>
 
@@ -135,6 +137,68 @@ <h2 class="phpdocumentor-content__title">
         
 
         
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -159,5 +223,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-Exception-OutOfRangeException.html b/docs/classes/Nitric-Api-Exception-OutOfRangeException.html
index e7c00cc..3f9b767 100644
--- a/docs/classes/Nitric-Api-Exception-OutOfRangeException.html
+++ b/docs/classes/Nitric-Api-Exception-OutOfRangeException.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -115,7 +116,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Exception/OutOfRangeException.php"><a href="files/nitric-api-exception-outofrangeexception.html"><abbr title="Nitric/Api/Exception/OutOfRangeException.php">OutOfRangeException.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class OutOfRangeException</p>
 
@@ -135,6 +137,68 @@ <h2 class="phpdocumentor-content__title">
         
 
         
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -159,5 +223,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-Exception-PermissionDeniedException.html b/docs/classes/Nitric-Api-Exception-PermissionDeniedException.html
index e8788a7..f0aba87 100644
--- a/docs/classes/Nitric-Api-Exception-PermissionDeniedException.html
+++ b/docs/classes/Nitric-Api-Exception-PermissionDeniedException.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -115,7 +116,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Exception/PermissionDeniedException.php"><a href="files/nitric-api-exception-permissiondeniedexception.html"><abbr title="Nitric/Api/Exception/PermissionDeniedException.php">PermissionDeniedException.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class PermissionDeniedException</p>
 
@@ -135,6 +137,68 @@ <h2 class="phpdocumentor-content__title">
         
 
         
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -159,5 +223,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-Exception-ResourceExhaustedException.html b/docs/classes/Nitric-Api-Exception-ResourceExhaustedException.html
index 6a5173f..9cbdd20 100644
--- a/docs/classes/Nitric-Api-Exception-ResourceExhaustedException.html
+++ b/docs/classes/Nitric-Api-Exception-ResourceExhaustedException.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -115,7 +116,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Exception/ResourceExhaustedException.php"><a href="files/nitric-api-exception-resourceexhaustedexception.html"><abbr title="Nitric/Api/Exception/ResourceExhaustedException.php">ResourceExhaustedException.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class ResourceExhaustedException</p>
 
@@ -135,6 +137,68 @@ <h2 class="phpdocumentor-content__title">
         
 
         
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -159,5 +223,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-Exception-UnauthenticatedException.html b/docs/classes/Nitric-Api-Exception-UnauthenticatedException.html
index 2fe9847..8de7501 100644
--- a/docs/classes/Nitric-Api-Exception-UnauthenticatedException.html
+++ b/docs/classes/Nitric-Api-Exception-UnauthenticatedException.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -115,7 +116,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Exception/UnauthenticatedException.php"><a href="files/nitric-api-exception-unauthenticatedexception.html"><abbr title="Nitric/Api/Exception/UnauthenticatedException.php">UnauthenticatedException.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class UnauthenticatedException</p>
 
@@ -135,6 +137,68 @@ <h2 class="phpdocumentor-content__title">
         
 
         
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -159,5 +223,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-Exception-UnavailableException.html b/docs/classes/Nitric-Api-Exception-UnavailableException.html
index 2b6ae3a..579a066 100644
--- a/docs/classes/Nitric-Api-Exception-UnavailableException.html
+++ b/docs/classes/Nitric-Api-Exception-UnavailableException.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -115,7 +116,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Exception/UnavailableException.php"><a href="files/nitric-api-exception-unavailableexception.html"><abbr title="Nitric/Api/Exception/UnavailableException.php">UnavailableException.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class UnavailableException</p>
 
@@ -135,6 +137,68 @@ <h2 class="phpdocumentor-content__title">
         
 
         
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -159,5 +223,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-Exception-UnimplementedException.html b/docs/classes/Nitric-Api-Exception-UnimplementedException.html
index 725f356..dfc12a2 100644
--- a/docs/classes/Nitric-Api-Exception-UnimplementedException.html
+++ b/docs/classes/Nitric-Api-Exception-UnimplementedException.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -115,7 +116,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Exception/UnimplementedException.php"><a href="files/nitric-api-exception-unimplementedexception.html"><abbr title="Nitric/Api/Exception/UnimplementedException.php">UnimplementedException.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class UnimplementedException</p>
 
@@ -135,6 +137,68 @@ <h2 class="phpdocumentor-content__title">
         
 
         
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -159,5 +223,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-FailedTask.html b/docs/classes/Nitric-Api-FailedTask.html
index a6b536c..ea475f2 100644
--- a/docs/classes/Nitric-Api-FailedTask.html
+++ b/docs/classes/Nitric-Api-FailedTask.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -110,7 +111,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/FailedTask.php"><a href="files/nitric-api-failedtask.html"><abbr title="Nitric/Api/FailedTask.php">FailedTask.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">25</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class FailedTask represents a task that was unable to be sent, along with the reason for the failure.</p>
 
@@ -206,7 +208,8 @@ <h4 class="phpdocumentor-element__name" id="property_message">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/FailedTask.php"><a href="files/nitric-api-failedtask.html"><abbr title="Nitric/Api/FailedTask.php">FailedTask.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">61</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -239,7 +242,8 @@ <h4 class="phpdocumentor-element__name" id="property_task">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/FailedTask.php"><a href="files/nitric-api-failedtask.html"><abbr title="Nitric/Api/FailedTask.php">FailedTask.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -276,7 +280,8 @@ <h4 class="phpdocumentor-element__name" id="method___construct">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/FailedTask.php"><a href="files/nitric-api-failedtask.html"><abbr title="Nitric/Api/FailedTask.php">FailedTask.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">63</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -327,7 +332,8 @@ <h4 class="phpdocumentor-element__name" id="method_getMessage">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/FailedTask.php"><a href="files/nitric-api-failedtask.html"><abbr title="Nitric/Api/FailedTask.php">FailedTask.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">48</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -358,7 +364,8 @@ <h4 class="phpdocumentor-element__name" id="method_getTask">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/FailedTask.php"><a href="files/nitric-api-failedtask.html"><abbr title="Nitric/Api/FailedTask.php">FailedTask.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">32</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -389,7 +396,8 @@ <h4 class="phpdocumentor-element__name" id="method_setMessage">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/FailedTask.php"><a href="files/nitric-api-failedtask.html"><abbr title="Nitric/Api/FailedTask.php">FailedTask.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">56</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -430,7 +438,8 @@ <h4 class="phpdocumentor-element__name" id="method_setTask">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/FailedTask.php"><a href="files/nitric-api-failedtask.html"><abbr title="Nitric/Api/FailedTask.php">FailedTask.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">40</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -459,6 +468,68 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
 </article>
             </section>
 
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -483,5 +554,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-KeyValueClient.html b/docs/classes/Nitric-Api-KeyValueClient.html
index f250d50..b6f4f92 100644
--- a/docs/classes/Nitric-Api-KeyValueClient.html
+++ b/docs/classes/Nitric-Api-KeyValueClient.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -113,7 +114,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/KeyValueClient.php"><a href="files/nitric-api-keyvalueclient.html"><abbr title="Nitric/Api/KeyValueClient.php">KeyValueClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">33</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class KeyValueClient provides a client for the Nitric Key Value Service.</p>
 
@@ -229,7 +231,8 @@ <h4 class="phpdocumentor-element__name" id="constant_SERVICE_BIND">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">66</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-signature phpdocumentor-code ">
@@ -272,7 +275,8 @@ <h4 class="phpdocumentor-element__name" id="property_hostname">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">67</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -305,7 +309,8 @@ <h4 class="phpdocumentor-element__name" id="property_opts">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">68</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -338,7 +343,8 @@ <h4 class="phpdocumentor-element__name" id="property_client">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/KeyValueClient.php"><a href="files/nitric-api-keyvalueclient.html"><abbr title="Nitric/Api/KeyValueClient.php">KeyValueClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">35</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -375,7 +381,8 @@ <h4 class="phpdocumentor-element__name" id="method___construct">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/KeyValueClient.php"><a href="files/nitric-api-keyvalueclient.html"><abbr title="Nitric/Api/KeyValueClient.php">KeyValueClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">42</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">KeyValueClient constructor.</p>
 
@@ -419,7 +426,8 @@ <h4 class="phpdocumentor-element__name" id="method_classFromStruct">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">90</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -462,7 +470,8 @@ <h4 class="phpdocumentor-element__name" id="method_delete">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/KeyValueClient.php"><a href="files/nitric-api-keyvalueclient.html"><abbr title="Nitric/Api/KeyValueClient.php">KeyValueClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">103</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Delete the specified value from the collection.</p>
 
@@ -529,7 +538,8 @@ <h4 class="phpdocumentor-element__name" id="method_get">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/KeyValueClient.php"><a href="files/nitric-api-keyvalueclient.html"><abbr title="Nitric/Api/KeyValueClient.php">KeyValueClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">82</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Retrieve a value from the specified collection by its key.</p>
 
@@ -598,7 +608,8 @@ <h4 class="phpdocumentor-element__name" id="method_put">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/KeyValueClient.php"><a href="files/nitric-api-keyvalueclient.html"><abbr title="Nitric/Api/KeyValueClient.php">KeyValueClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">60</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Store a value by a unique key in the specified collection.</p>
 
@@ -674,7 +685,8 @@ <h4 class="phpdocumentor-element__name" id="method_structFromClass">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">79</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -717,7 +729,8 @@ <h4 class="phpdocumentor-element__name" id="method_okOrThrow">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">108</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Check the status returned from an autogenerate gRPC client call. If any status other than OK is detected, throw
 the corresponding exception type.</p>
@@ -748,6 +761,68 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
 </article>
             </section>
 
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -772,5 +847,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-QueueClient.html b/docs/classes/Nitric-Api-QueueClient.html
index 94103b5..7e311a0 100644
--- a/docs/classes/Nitric-Api-QueueClient.html
+++ b/docs/classes/Nitric-Api-QueueClient.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -113,7 +114,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/QueueClient.php"><a href="files/nitric-api-queueclient.html"><abbr title="Nitric/Api/QueueClient.php">QueueClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">35</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class QueueClient provides a client for the Nitric Queue Service.</p>
 
@@ -243,7 +245,8 @@ <h4 class="phpdocumentor-element__name" id="constant_SERVICE_BIND">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">66</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-signature phpdocumentor-code ">
@@ -286,7 +289,8 @@ <h4 class="phpdocumentor-element__name" id="property_hostname">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">67</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -319,7 +323,8 @@ <h4 class="phpdocumentor-element__name" id="property_opts">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">68</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -352,7 +357,8 @@ <h4 class="phpdocumentor-element__name" id="property_client">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/QueueClient.php"><a href="files/nitric-api-queueclient.html"><abbr title="Nitric/Api/QueueClient.php">QueueClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">37</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -389,7 +395,8 @@ <h4 class="phpdocumentor-element__name" id="method___construct">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/QueueClient.php"><a href="files/nitric-api-queueclient.html"><abbr title="Nitric/Api/QueueClient.php">QueueClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">44</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">QueueClient constructor.</p>
 
@@ -433,7 +440,8 @@ <h4 class="phpdocumentor-element__name" id="method_classFromStruct">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">90</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -476,7 +484,8 @@ <h4 class="phpdocumentor-element__name" id="method_complete">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/QueueClient.php"><a href="files/nitric-api-queueclient.html"><abbr title="Nitric/Api/QueueClient.php">QueueClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">184</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Mark a task as complete, removing it from the queue to prevent reprocessing.</p>
 
@@ -529,7 +538,8 @@ <h4 class="phpdocumentor-element__name" id="method_receive">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/QueueClient.php"><a href="files/nitric-api-queueclient.html"><abbr title="Nitric/Api/QueueClient.php">QueueClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">151</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Pop 1 or more items from the specified queue up to the depth limit.</p>
 
@@ -604,7 +614,8 @@ <h4 class="phpdocumentor-element__name" id="method_send">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/QueueClient.php"><a href="files/nitric-api-queueclient.html"><abbr title="Nitric/Api/QueueClient.php">QueueClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">80</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Send a task to a queue, which can be received by other services.</p>
 
@@ -671,7 +682,8 @@ <h4 class="phpdocumentor-element__name" id="method_sendBatch">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/QueueClient.php"><a href="files/nitric-api-queueclient.html"><abbr title="Nitric/Api/QueueClient.php">QueueClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">99</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Send a collection of tasks to a queue, which can be received by other services.</p>
 
@@ -740,7 +752,8 @@ <h4 class="phpdocumentor-element__name" id="method_structFromClass">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">79</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -783,7 +796,8 @@ <h4 class="phpdocumentor-element__name" id="method_okOrThrow">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">108</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Check the status returned from an autogenerate gRPC client call. If any status other than OK is detected, throw
 the corresponding exception type.</p>
@@ -826,7 +840,8 @@ <h4 class="phpdocumentor-element__name" id="method_taskToWire">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/QueueClient.php"><a href="files/nitric-api-queueclient.html"><abbr title="Nitric/Api/QueueClient.php">QueueClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">61</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Convert the API class representing a task to the protobuf class</p>
 
@@ -870,6 +885,68 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
 </article>
             </section>
 
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -894,5 +971,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-StorageClient.html b/docs/classes/Nitric-Api-StorageClient.html
index 11e094c..d333500 100644
--- a/docs/classes/Nitric-Api-StorageClient.html
+++ b/docs/classes/Nitric-Api-StorageClient.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -113,7 +114,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/StorageClient.php"><a href="files/nitric-api-storageclient.html"><abbr title="Nitric/Api/StorageClient.php">StorageClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">33</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class StorageClient provides a client for the Nitric Storage Service.</p>
 
@@ -229,7 +231,8 @@ <h4 class="phpdocumentor-element__name" id="constant_SERVICE_BIND">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">66</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-signature phpdocumentor-code ">
@@ -272,7 +275,8 @@ <h4 class="phpdocumentor-element__name" id="property_hostname">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">67</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -305,7 +309,8 @@ <h4 class="phpdocumentor-element__name" id="property_opts">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">68</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -338,7 +343,8 @@ <h4 class="phpdocumentor-element__name" id="property_client">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/StorageClient.php"><a href="files/nitric-api-storageclient.html"><abbr title="Nitric/Api/StorageClient.php">StorageClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">35</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -375,7 +381,8 @@ <h4 class="phpdocumentor-element__name" id="method___construct">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/StorageClient.php"><a href="files/nitric-api-storageclient.html"><abbr title="Nitric/Api/StorageClient.php">StorageClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">42</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">StorageClient constructor.</p>
 
@@ -419,7 +426,8 @@ <h4 class="phpdocumentor-element__name" id="method_classFromStruct">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">90</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -462,7 +470,8 @@ <h4 class="phpdocumentor-element__name" id="method_delete">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/StorageClient.php"><a href="files/nitric-api-storageclient.html"><abbr title="Nitric/Api/StorageClient.php">StorageClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">95</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -528,7 +537,8 @@ <h4 class="phpdocumentor-element__name" id="method_read">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/StorageClient.php"><a href="files/nitric-api-storageclient.html"><abbr title="Nitric/Api/StorageClient.php">StorageClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">77</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -596,7 +606,8 @@ <h4 class="phpdocumentor-element__name" id="method_structFromClass">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">79</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -639,7 +650,8 @@ <h4 class="phpdocumentor-element__name" id="method_write">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/StorageClient.php"><a href="files/nitric-api-storageclient.html"><abbr title="Nitric/Api/StorageClient.php">StorageClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">60</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Store a file</p>
 
@@ -715,7 +727,8 @@ <h4 class="phpdocumentor-element__name" id="method_okOrThrow">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">108</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Check the status returned from an autogenerate gRPC client call. If any status other than OK is detected, throw
 the corresponding exception type.</p>
@@ -746,6 +759,68 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
 </article>
             </section>
 
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -770,5 +845,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-Task.html b/docs/classes/Nitric-Api-Task.html
index 37ce9de..6a0c322 100644
--- a/docs/classes/Nitric-Api-Task.html
+++ b/docs/classes/Nitric-Api-Task.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -110,7 +111,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Task.php"><a href="files/nitric-api-task.html"><abbr title="Nitric/Api/Task.php">Task.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">28</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class Task represents a task message to be sent or received via a queue.</p>
 
@@ -262,7 +264,8 @@ <h4 class="phpdocumentor-element__name" id="property_id">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Task.php"><a href="files/nitric-api-task.html"><abbr title="Nitric/Api/Task.php">Task.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">30</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -295,7 +298,8 @@ <h4 class="phpdocumentor-element__name" id="property_leaseID">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Task.php"><a href="files/nitric-api-task.html"><abbr title="Nitric/Api/Task.php">Task.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">33</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -328,7 +332,8 @@ <h4 class="phpdocumentor-element__name" id="property_payload">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Task.php"><a href="files/nitric-api-task.html"><abbr title="Nitric/Api/Task.php">Task.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">31</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -361,7 +366,8 @@ <h4 class="phpdocumentor-element__name" id="property_payloadType">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Task.php"><a href="files/nitric-api-task.html"><abbr title="Nitric/Api/Task.php">Task.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">32</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -398,7 +404,8 @@ <h4 class="phpdocumentor-element__name" id="method___construct">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Task.php"><a href="files/nitric-api-task.html"><abbr title="Nitric/Api/Task.php">Task.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">35</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -465,7 +472,8 @@ <h4 class="phpdocumentor-element__name" id="method_getId">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Task.php"><a href="files/nitric-api-task.html"><abbr title="Nitric/Api/Task.php">Task.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">50</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -496,7 +504,8 @@ <h4 class="phpdocumentor-element__name" id="method_getLeaseId">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Task.php"><a href="files/nitric-api-task.html"><abbr title="Nitric/Api/Task.php">Task.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">98</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -527,7 +536,8 @@ <h4 class="phpdocumentor-element__name" id="method_getPayload">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Task.php"><a href="files/nitric-api-task.html"><abbr title="Nitric/Api/Task.php">Task.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">66</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -558,7 +568,8 @@ <h4 class="phpdocumentor-element__name" id="method_getPayloadType">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Task.php"><a href="files/nitric-api-task.html"><abbr title="Nitric/Api/Task.php">Task.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">82</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -589,7 +600,8 @@ <h4 class="phpdocumentor-element__name" id="method_setId">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Task.php"><a href="files/nitric-api-task.html"><abbr title="Nitric/Api/Task.php">Task.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">58</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -630,7 +642,8 @@ <h4 class="phpdocumentor-element__name" id="method_setLeaseId">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Task.php"><a href="files/nitric-api-task.html"><abbr title="Nitric/Api/Task.php">Task.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">106</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -671,7 +684,8 @@ <h4 class="phpdocumentor-element__name" id="method_setPayload">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Task.php"><a href="files/nitric-api-task.html"><abbr title="Nitric/Api/Task.php">Task.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">74</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -712,7 +726,8 @@ <h4 class="phpdocumentor-element__name" id="method_setPayloadType">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/Task.php"><a href="files/nitric-api-task.html"><abbr title="Nitric/Api/Task.php">Task.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">90</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -741,6 +756,68 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
 </article>
             </section>
 
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -765,5 +842,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-TopicClient.html b/docs/classes/Nitric-Api-TopicClient.html
index d71957e..4a6c938 100644
--- a/docs/classes/Nitric-Api-TopicClient.html
+++ b/docs/classes/Nitric-Api-TopicClient.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -113,7 +114,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/TopicClient.php"><a href="files/nitric-api-topicclient.html"><abbr title="Nitric/Api/TopicClient.php">TopicClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">30</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class TopicClient provides a client for the Nitric Topic Service.</p>
 
@@ -215,7 +217,8 @@ <h4 class="phpdocumentor-element__name" id="constant_SERVICE_BIND">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">66</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-signature phpdocumentor-code ">
@@ -258,7 +261,8 @@ <h4 class="phpdocumentor-element__name" id="property_hostname">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">67</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -291,7 +295,8 @@ <h4 class="phpdocumentor-element__name" id="property_opts">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">68</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -324,7 +329,8 @@ <h4 class="phpdocumentor-element__name" id="property_client">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/TopicClient.php"><a href="files/nitric-api-topicclient.html"><abbr title="Nitric/Api/TopicClient.php">TopicClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">32</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -361,7 +367,8 @@ <h4 class="phpdocumentor-element__name" id="method___construct">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/TopicClient.php"><a href="files/nitric-api-topicclient.html"><abbr title="Nitric/Api/TopicClient.php">TopicClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">39</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">TopicClient constructor.</p>
 
@@ -405,7 +412,8 @@ <h4 class="phpdocumentor-element__name" id="method_classFromStruct">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">90</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -448,7 +456,8 @@ <h4 class="phpdocumentor-element__name" id="method_list">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/TopicClient.php"><a href="files/nitric-api-topicclient.html"><abbr title="Nitric/Api/TopicClient.php">TopicClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">55</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Return a list of topics available for publishing or subscriptions.</p>
 
@@ -496,7 +505,8 @@ <h4 class="phpdocumentor-element__name" id="method_structFromClass">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">79</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -539,7 +549,8 @@ <h4 class="phpdocumentor-element__name" id="method_okOrThrow">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">108</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Check the status returned from an autogenerate gRPC client call. If any status other than OK is detected, throw
 the corresponding exception type.</p>
@@ -570,6 +581,68 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
 </article>
             </section>
 
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -594,5 +667,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Api-UserClient.html b/docs/classes/Nitric-Api-UserClient.html
index b9944bd..7cf8496 100644
--- a/docs/classes/Nitric-Api-UserClient.html
+++ b/docs/classes/Nitric-Api-UserClient.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -113,7 +114,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/UserClient.php"><a href="files/nitric-api-userclient.html"><abbr title="Nitric/Api/UserClient.php">UserClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">28</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class UserClient provides a client for the Nitric User Service.</p>
 
@@ -215,7 +217,8 @@ <h4 class="phpdocumentor-element__name" id="constant_SERVICE_BIND">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">66</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-signature phpdocumentor-code ">
@@ -258,7 +261,8 @@ <h4 class="phpdocumentor-element__name" id="property_hostname">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">67</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -291,7 +295,8 @@ <h4 class="phpdocumentor-element__name" id="property_opts">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">68</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -324,7 +329,8 @@ <h4 class="phpdocumentor-element__name" id="property_client">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/UserClient.php"><a href="files/nitric-api-userclient.html"><abbr title="Nitric/Api/UserClient.php">UserClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">30</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -361,7 +367,8 @@ <h4 class="phpdocumentor-element__name" id="method___construct">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/UserClient.php"><a href="files/nitric-api-userclient.html"><abbr title="Nitric/Api/UserClient.php">UserClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">37</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">UserClient constructor.</p>
 
@@ -405,7 +412,8 @@ <h4 class="phpdocumentor-element__name" id="method_classFromStruct">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">90</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -448,7 +456,8 @@ <h4 class="phpdocumentor-element__name" id="method_create">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/UserClient.php"><a href="files/nitric-api-userclient.html"><abbr title="Nitric/Api/UserClient.php">UserClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">47</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -515,7 +524,8 @@ <h4 class="phpdocumentor-element__name" id="method_structFromClass">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">79</span>
-</aside>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -558,7 +568,8 @@ <h4 class="phpdocumentor-element__name" id="method_okOrThrow">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Api/AbstractClient.php"><a href="files/nitric-api-abstractclient.html"><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">108</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Check the status returned from an autogenerate gRPC client call. If any status other than OK is detected, throw
 the corresponding exception type.</p>
@@ -589,6 +600,68 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
 </article>
             </section>
 
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -613,5 +686,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Faas-Context.html b/docs/classes/Nitric-Faas-Context.html
index 4b271a3..dada16a 100644
--- a/docs/classes/Nitric-Faas-Context.html
+++ b/docs/classes/Nitric-Faas-Context.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -109,10 +110,11 @@ <h2 class="phpdocumentor-content__title">
         <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">25</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">29</span>
+
+    </aside>
 
-            <p class="phpdocumentor-summary">Class Context represents the metadata of a FaaS request, including the source, payload type, unique request Id, etc.</p>
+            <p class="phpdocumentor-summary">Class Context represents the metadata of a FaaS request</p>
 
 
 
@@ -128,108 +130,52 @@ <h3 id="toc">
 </h3>
 
 <dl class="phpdocumentor-table-of-contents">
-                <dt class="phpdocumentor-table-of-contents__entry -property -private">
-    <a href="classes/Nitric-Faas-Context.html#property_payloadType">$payloadType</a>
-    <span>
-                &nbsp;: string|null            </span>
-</dt>
-<dd></dd>
-
-            <dt class="phpdocumentor-table-of-contents__entry -property -private">
-    <a href="classes/Nitric-Faas-Context.html#property_requestID">$requestID</a>
+                    <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-Context.html#method_asHttpContext">asHttpContext()</a>
     <span>
-                &nbsp;: string|null            </span>
+                        &nbsp;: <a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a>    </span>
 </dt>
 <dd></dd>
 
-            <dt class="phpdocumentor-table-of-contents__entry -property -private">
-    <a href="classes/Nitric-Faas-Context.html#property_source">$source</a>
-    <span>
-                &nbsp;: string|null            </span>
-</dt>
-<dd></dd>
-
-            <dt class="phpdocumentor-table-of-contents__entry -property -private">
-    <a href="classes/Nitric-Faas-Context.html#property_sourceType">$sourceType</a>
-    <span>
-                &nbsp;: string            </span>
-</dt>
-<dd></dd>
-
-                <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Context.html#method___construct">__construct()</a>
-    <span>
-                        &nbsp;: mixed    </span>
-</dt>
-<dd>Context constructor.</dd>
-
             <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Context.html#method_fromHeaders">fromHeaders()</a>
+    <a href="classes/Nitric-Faas-Context.html#method_asTopicContext">asTopicContext()</a>
     <span>
-                        &nbsp;: <a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a>    </span>
+                        &nbsp;: <a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a>    </span>
 </dt>
 <dd></dd>
 
             <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Context.html#method_getPayloadType">getPayloadType()</a>
+    <a href="classes/Nitric-Faas-Context.html#method_fromHttpTriggerContext">fromHttpTriggerContext()</a>
     <span>
-                        &nbsp;: string    </span>
+                        &nbsp;: <a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a>    </span>
 </dt>
 <dd></dd>
 
             <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Context.html#method_getRequestID">getRequestID()</a>
+    <a href="classes/Nitric-Faas-Context.html#method_fromTopicTriggerContext">fromTopicTriggerContext()</a>
     <span>
-                        &nbsp;: string    </span>
+                        &nbsp;: <a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a>    </span>
 </dt>
 <dd></dd>
 
             <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Context.html#method_getSource">getSource()</a>
+    <a href="classes/Nitric-Faas-Context.html#method_fromTriggerRequest">fromTriggerRequest()</a>
     <span>
-                        &nbsp;: string    </span>
-</dt>
-<dd></dd>
-
-            <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Context.html#method_getSourceType">getSourceType()</a>
-    <span>
-                        &nbsp;: string    </span>
-</dt>
-<dd></dd>
-
-            <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Context.html#method_setPayloadType">setPayloadType()</a>
-    <span>
-                        &nbsp;: void    </span>
-</dt>
-<dd></dd>
-
-            <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Context.html#method_setRequestID">setRequestID()</a>
-    <span>
-                        &nbsp;: void    </span>
+                        &nbsp;: <a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a>    </span>
 </dt>
 <dd></dd>
 
             <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Context.html#method_setSource">setSource()</a>
+    <a href="classes/Nitric-Faas-Context.html#method_isHttp">isHttp()</a>
     <span>
-                        &nbsp;: void    </span>
+                        &nbsp;: bool    </span>
 </dt>
 <dd></dd>
 
             <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Context.html#method_setSourceType">setSourceType()</a>
-    <span>
-                        &nbsp;: void    </span>
-</dt>
-<dd></dd>
-
-            <dt class="phpdocumentor-table-of-contents__entry -method -private">
-    <a href="classes/Nitric-Faas-Context.html#method_getValueIfExists">getValueIfExists()</a>
+    <a href="classes/Nitric-Faas-Context.html#method_isTopic">isTopic()</a>
     <span>
-                        &nbsp;: mixed    </span>
+                        &nbsp;: bool    </span>
 </dt>
 <dd></dd>
 
@@ -240,144 +186,6 @@ <h3 id="toc">
         
 
         
-    <section class="phpdocumentor-properties">
-        <h3 class="phpdocumentor-elements__header" id="properties">
-            Properties
-            <a href="classes/Nitric-Faas-Context.html#properties" class="headerlink"><i class="fas fa-link"></i></a>
-        </h3>
-                    <article
-        class="
-            phpdocumentor-element
-            -property
-            -private
-                                                        "
->
-    <h4 class="phpdocumentor-element__name" id="property_payloadType">
-        $payloadType
-        <a href="classes/Nitric-Faas-Context.html#property_payloadType" class="headerlink"><i class="fas fa-link"></i></a>
-        <span class="phpdocumentor-element__modifiers">
-                                </span>
-    </h4>
-    <aside class="phpdocumentor-element-found-in">
-    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
-    :
-    <span class="phpdocumentor-element-found-in__line">30</span>
-</aside>
-
-    
-    <code class="phpdocumentor-code phpdocumentor-signature ">
-    <span class="phpdocumentor-signature__visibility">private</span>
-        <span class="phpdocumentor-signature__type">string|null</span>
-    <span class="phpdocumentor-signature__name">$payloadType</span>
-    </code>
-
-        <section class="phpdocumentor-description"></section>
-
-        <section class="phpdocumentor-description"></section>
-
-    
-
-</article>
-                    <article
-        class="
-            phpdocumentor-element
-            -property
-            -private
-                                                        "
->
-    <h4 class="phpdocumentor-element__name" id="property_requestID">
-        $requestID
-        <a href="classes/Nitric-Faas-Context.html#property_requestID" class="headerlink"><i class="fas fa-link"></i></a>
-        <span class="phpdocumentor-element__modifiers">
-                                </span>
-    </h4>
-    <aside class="phpdocumentor-element-found-in">
-    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
-    :
-    <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
-
-    
-    <code class="phpdocumentor-code phpdocumentor-signature ">
-    <span class="phpdocumentor-signature__visibility">private</span>
-        <span class="phpdocumentor-signature__type">string|null</span>
-    <span class="phpdocumentor-signature__name">$requestID</span>
-    </code>
-
-        <section class="phpdocumentor-description"></section>
-
-        <section class="phpdocumentor-description"></section>
-
-    
-
-</article>
-                    <article
-        class="
-            phpdocumentor-element
-            -property
-            -private
-                                                        "
->
-    <h4 class="phpdocumentor-element__name" id="property_source">
-        $source
-        <a href="classes/Nitric-Faas-Context.html#property_source" class="headerlink"><i class="fas fa-link"></i></a>
-        <span class="phpdocumentor-element__modifiers">
-                                </span>
-    </h4>
-    <aside class="phpdocumentor-element-found-in">
-    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
-    :
-    <span class="phpdocumentor-element-found-in__line">28</span>
-</aside>
-
-    
-    <code class="phpdocumentor-code phpdocumentor-signature ">
-    <span class="phpdocumentor-signature__visibility">private</span>
-        <span class="phpdocumentor-signature__type">string|null</span>
-    <span class="phpdocumentor-signature__name">$source</span>
-    </code>
-
-        <section class="phpdocumentor-description"></section>
-
-        <section class="phpdocumentor-description"></section>
-
-    
-
-</article>
-                    <article
-        class="
-            phpdocumentor-element
-            -property
-            -private
-                                                        "
->
-    <h4 class="phpdocumentor-element__name" id="property_sourceType">
-        $sourceType
-        <a href="classes/Nitric-Faas-Context.html#property_sourceType" class="headerlink"><i class="fas fa-link"></i></a>
-        <span class="phpdocumentor-element__modifiers">
-                                </span>
-    </h4>
-    <aside class="phpdocumentor-element-found-in">
-    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
-    :
-    <span class="phpdocumentor-element-found-in__line">29</span>
-</aside>
-
-    
-    <code class="phpdocumentor-code phpdocumentor-signature ">
-    <span class="phpdocumentor-signature__visibility">private</span>
-        <span class="phpdocumentor-signature__type">string</span>
-    <span class="phpdocumentor-signature__name">$sourceType</span>
-    </code>
-
-        <section class="phpdocumentor-description"></section>
-
-        <section class="phpdocumentor-description"></section>
-
-    
-
-</article>
-            </section>
 
             <section class="phpdocumentor-methods">
         <h3 class="phpdocumentor-elements__header" id="methods">
@@ -390,133 +198,28 @@ <h3 class="phpdocumentor-elements__header" id="methods">
             -public
                                                         "
 >
-    <h4 class="phpdocumentor-element__name" id="method___construct">
-        __construct()
-        <a href="classes/Nitric-Faas-Context.html#method___construct" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="method_asHttpContext">
+        asHttpContext()
+        <a href="classes/Nitric-Faas-Context.html#method_asHttpContext" class="headerlink"><i class="fas fa-link"></i></a>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">40</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">62</span>
 
-        <p class="phpdocumentor-summary">Context constructor.</p>
-
-    <code class="phpdocumentor-code phpdocumentor-signature ">
-    <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">__construct</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type">string|null&nbsp;</span><span class="phpdocumentor-signature__argument__name">$requestID</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type">string|null&nbsp;</span><span class="phpdocumentor-signature__argument__name">$source</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$sourceType</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type">string|null&nbsp;</span><span class="phpdocumentor-signature__argument__name">$payloadType</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
-
-    
-        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
-    <dl class="phpdocumentor-argument-list">
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$requestID</span>
-                : <span class="phpdocumentor-signature__argument__return-type">string|null</span>
-                            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                
-            </dd>
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$source</span>
-                : <span class="phpdocumentor-signature__argument__return-type">string|null</span>
-                            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                
-            </dd>
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$sourceType</span>
-                : <span class="phpdocumentor-signature__argument__return-type">string</span>
-                            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                
-            </dd>
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$payloadType</span>
-                : <span class="phpdocumentor-signature__argument__return-type">string|null</span>
-                            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                
-            </dd>
-            </dl>
-
-    
-
-        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">mixed</span>
-            &mdash;
-        
-    
-</article>
-                    <article
-        class="phpdocumentor-element
-            -method
-            -public
-                                    -static                    "
->
-    <h4 class="phpdocumentor-element__name" id="method_fromHeaders">
-        fromHeaders()
-        <a href="classes/Nitric-Faas-Context.html#method_fromHeaders" class="headerlink"><i class="fas fa-link"></i></a>
-    </h4>
-    <aside class="phpdocumentor-element-found-in">
-    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
-    :
-    <span class="phpdocumentor-element-found-in__line">57</span>
-</aside>
-
-    
-    <code class="phpdocumentor-code phpdocumentor-signature ">
-    <span class="phpdocumentor-signature__visibility">public</span>
-            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">fromHeaders</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type">array&lt;string|int, mixed&gt;&nbsp;</span><span class="phpdocumentor-signature__argument__name">$headers</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a></span></code>
-
-        <section class="phpdocumentor-description"></section>
-
-        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
-    <dl class="phpdocumentor-argument-list">
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$headers</span>
-                : <span class="phpdocumentor-signature__argument__return-type">array&lt;string|int, mixed&gt;</span>
-                            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                    <section class="phpdocumentor-description"></section>
-
-            </dd>
-            </dl>
-
-    
-
-        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a></span>
-            &mdash;
-        
-    
-</article>
-                    <article
-        class="phpdocumentor-element
-            -method
-            -public
-                                                        "
->
-    <h4 class="phpdocumentor-element__name" id="method_getPayloadType">
-        getPayloadType()
-        <a href="classes/Nitric-Faas-Context.html#method_getPayloadType" class="headerlink"><i class="fas fa-link"></i></a>
-    </h4>
-    <aside class="phpdocumentor-element-found-in">
-    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
-    :
-    <span class="phpdocumentor-element-found-in__line">123</span>
-</aside>
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">getPayloadType</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">string</span></code>
+                <span class="phpdocumentor-signature__name">asHttpContext</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a></span></code>
 
     
     
     
 
         <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">string</span>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a></span>
             &mdash;
         
     
@@ -527,58 +230,28 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
             -public
                                                         "
 >
-    <h4 class="phpdocumentor-element__name" id="method_getRequestID">
-        getRequestID()
-        <a href="classes/Nitric-Faas-Context.html#method_getRequestID" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="method_asTopicContext">
+        asTopicContext()
+        <a href="classes/Nitric-Faas-Context.html#method_asTopicContext" class="headerlink"><i class="fas fa-link"></i></a>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">75</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">51</span>
 
-    
-    <code class="phpdocumentor-code phpdocumentor-signature ">
-    <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">getRequestID</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">string</span></code>
-
-    
-    
-    
-
-        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">string</span>
-            &mdash;
-        
-    
-</article>
-                    <article
-        class="phpdocumentor-element
-            -method
-            -public
-                                                        "
->
-    <h4 class="phpdocumentor-element__name" id="method_getSource">
-        getSource()
-        <a href="classes/Nitric-Faas-Context.html#method_getSource" class="headerlink"><i class="fas fa-link"></i></a>
-    </h4>
-    <aside class="phpdocumentor-element-found-in">
-    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
-    :
-    <span class="phpdocumentor-element-found-in__line">91</span>
-</aside>
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">getSource</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">string</span></code>
+                <span class="phpdocumentor-signature__name">asTopicContext</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a></span></code>
 
     
     
     
 
         <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">string</span>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a></span>
             &mdash;
         
     
@@ -587,70 +260,41 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
         class="phpdocumentor-element
             -method
             -public
-                                                        "
+                                    -static                    "
 >
-    <h4 class="phpdocumentor-element__name" id="method_getSourceType">
-        getSourceType()
-        <a href="classes/Nitric-Faas-Context.html#method_getSourceType" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="method_fromHttpTriggerContext">
+        fromHttpTriggerContext()
+        <a href="classes/Nitric-Faas-Context.html#method_fromHttpTriggerContext" class="headerlink"><i class="fas fa-link"></i></a>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">107</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">74</span>
 
-    
-    <code class="phpdocumentor-code phpdocumentor-signature ">
-    <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">getSourceType</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">string</span></code>
-
-    
-    
-    
-
-        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">string</span>
-            &mdash;
-        
-    
-</article>
-                    <article
-        class="phpdocumentor-element
-            -method
-            -public
-                                                        "
->
-    <h4 class="phpdocumentor-element__name" id="method_setPayloadType">
-        setPayloadType()
-        <a href="classes/Nitric-Faas-Context.html#method_setPayloadType" class="headerlink"><i class="fas fa-link"></i></a>
-    </h4>
-    <aside class="phpdocumentor-element-found-in">
-    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
-    :
-    <span class="phpdocumentor-element-found-in__line">131</span>
-</aside>
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">setPayloadType</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$payloadType</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">void</span></code>
+            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">fromHttpTriggerContext</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\HttpTriggerContext">HttpTriggerContext</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$context</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a></span></code>
 
     
         <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
     <dl class="phpdocumentor-argument-list">
                     <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$payloadType</span>
-                : <span class="phpdocumentor-signature__argument__return-type">string</span>
+                <span class="phpdocumentor-signature__argument__name">$context</span>
+                : <span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\HttpTriggerContext">HttpTriggerContext</abbr></span>
                             </dt>
             <dd class="phpdocumentor-argument-list__definition">
-                
+                    <section class="phpdocumentor-description"></section>
+
             </dd>
             </dl>
 
     
 
         <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">void</span>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a></span>
             &mdash;
         
     
@@ -659,39 +303,41 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
         class="phpdocumentor-element
             -method
             -public
-                                                        "
+                                    -static                    "
 >
-    <h4 class="phpdocumentor-element__name" id="method_setRequestID">
-        setRequestID()
-        <a href="classes/Nitric-Faas-Context.html#method_setRequestID" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="method_fromTopicTriggerContext">
+        fromTopicTriggerContext()
+        <a href="classes/Nitric-Faas-Context.html#method_fromTopicTriggerContext" class="headerlink"><i class="fas fa-link"></i></a>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">83</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">87</span>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">setRequestID</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$requestID</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">void</span></code>
+            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">fromTopicTriggerContext</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\TopicTriggerContext">TopicTriggerContext</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$context</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a></span></code>
 
     
         <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
     <dl class="phpdocumentor-argument-list">
                     <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$requestID</span>
-                : <span class="phpdocumentor-signature__argument__return-type">string</span>
+                <span class="phpdocumentor-signature__argument__name">$context</span>
+                : <span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\TopicTriggerContext">TopicTriggerContext</abbr></span>
                             </dt>
             <dd class="phpdocumentor-argument-list__definition">
-                
+                    <section class="phpdocumentor-description"></section>
+
             </dd>
             </dl>
 
     
 
         <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">void</span>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a></span>
             &mdash;
         
     
@@ -700,39 +346,41 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
         class="phpdocumentor-element
             -method
             -public
-                                                        "
+                                    -static                    "
 >
-    <h4 class="phpdocumentor-element__name" id="method_setSource">
-        setSource()
-        <a href="classes/Nitric-Faas-Context.html#method_setSource" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="method_fromTriggerRequest">
+        fromTriggerRequest()
+        <a href="classes/Nitric-Faas-Context.html#method_fromTriggerRequest" class="headerlink"><i class="fas fa-link"></i></a>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">99</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">97</span>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">setSource</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$source</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">void</span></code>
+            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">fromTriggerRequest</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\TriggerRequest">TriggerRequest</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$request</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a></span></code>
 
     
         <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
     <dl class="phpdocumentor-argument-list">
                     <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$source</span>
-                : <span class="phpdocumentor-signature__argument__return-type">string</span>
+                <span class="phpdocumentor-signature__argument__name">$request</span>
+                : <span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\TriggerRequest">TriggerRequest</abbr></span>
                             </dt>
             <dd class="phpdocumentor-argument-list__definition">
-                
+                    <section class="phpdocumentor-description"></section>
+
             </dd>
             </dl>
 
     
 
         <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">void</span>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a></span>
             &mdash;
         
     
@@ -743,37 +391,28 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
             -public
                                                         "
 >
-    <h4 class="phpdocumentor-element__name" id="method_setSourceType">
-        setSourceType()
-        <a href="classes/Nitric-Faas-Context.html#method_setSourceType" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="method_isHttp">
+        isHttp()
+        <a href="classes/Nitric-Faas-Context.html#method_isHttp" class="headerlink"><i class="fas fa-link"></i></a>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">115</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">43</span>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">setSourceType</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$sourceType</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">void</span></code>
+                <span class="phpdocumentor-signature__name">isHttp</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">bool</span></code>
 
     
-        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
-    <dl class="phpdocumentor-argument-list">
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$sourceType</span>
-                : <span class="phpdocumentor-signature__argument__return-type">string</span>
-                            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                
-            </dd>
-            </dl>
-
+    
     
 
         <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">void</span>
+    <span class="phpdocumentor-signature__response_type">bool</span>
             &mdash;
         
     
@@ -781,56 +420,99 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
                     <article
         class="phpdocumentor-element
             -method
-            -private
-                                    -static                    "
+            -public
+                                                        "
 >
-    <h4 class="phpdocumentor-element__name" id="method_getValueIfExists">
-        getValueIfExists()
-        <a href="classes/Nitric-Faas-Context.html#method_getValueIfExists" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="method_isTopic">
+        isTopic()
+        <a href="classes/Nitric-Faas-Context.html#method_isTopic" class="headerlink"><i class="fas fa-link"></i></a>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">52</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">35</span>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
-    <span class="phpdocumentor-signature__visibility">private</span>
-            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">getValueIfExists</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type">mixed&nbsp;</span><span class="phpdocumentor-signature__argument__name">$array</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type">mixed&nbsp;</span><span class="phpdocumentor-signature__argument__name">$key</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
-
-        <section class="phpdocumentor-description"></section>
-
-        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
-    <dl class="phpdocumentor-argument-list">
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$array</span>
-                : <span class="phpdocumentor-signature__argument__return-type">mixed</span>
-                            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                    <section class="phpdocumentor-description"></section>
-
-            </dd>
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$key</span>
-                : <span class="phpdocumentor-signature__argument__return-type">mixed</span>
-                            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                    <section class="phpdocumentor-description"></section>
-
-            </dd>
-            </dl>
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">isTopic</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">bool</span></code>
 
     
+    
+    
 
         <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">mixed</span>
+    <span class="phpdocumentor-signature__response_type">bool</span>
             &mdash;
         
     
 </article>
             </section>
 
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -855,5 +537,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Faas-Faas.html b/docs/classes/Nitric-Faas-Faas.html
index e50f0ec..0d376c0 100644
--- a/docs/classes/Nitric-Faas-Faas.html
+++ b/docs/classes/Nitric-Faas-Faas.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -109,8 +110,9 @@ <h2 class="phpdocumentor-content__title">
         <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Faas.php"><a href="files/nitric-faas-faas.html"><abbr title="Nitric/Faas/Faas.php">Faas.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">33</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">39</span>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Function-as-a-Service (Faas) class provides method that assist in writing Serverless Functions, using PHP.</p>
 
@@ -129,11 +131,11 @@ <h3 id="toc">
 
 <dl class="phpdocumentor-table-of-contents">
             <dt class="phpdocumentor-table-of-contents__entry -constant -private">
-    <a href="classes/Nitric-Faas-Faas.html#constant_CHILD_ADDRESS">CHILD_ADDRESS</a>
+    <a href="classes/Nitric-Faas-Faas.html#constant_SERVICE_ADDRESS">SERVICE_ADDRESS</a>
     <span>
-        &nbsp;= &quot;CHILD_ADDRESS&quot;                    </span>
+        &nbsp;= &quot;SERVICE_ADDRESS&quot;                    </span>
 </dt>
-<dd>Bind address for the FaaS service, defaults to &quot;127.0.0.1:8080&quot;.</dd>
+<dd></dd>
 
                     <dt class="phpdocumentor-table-of-contents__entry -method -public">
     <a href="classes/Nitric-Faas-Faas.html#method_start">start()</a>
@@ -142,13 +144,6 @@ <h3 id="toc">
 </dt>
 <dd>Begin handling FaaS triggers such as HTTP requests and Events.</dd>
 
-            <dt class="phpdocumentor-table-of-contents__entry -method -private">
-    <a href="classes/Nitric-Faas-Faas.html#method_httpResponse">httpResponse()</a>
-    <span>
-                        &nbsp;: <abbr title="\Amp\Http\Server\Response">Response</abbr>    </span>
-</dt>
-<dd>Convert a NitricResponse to a HTTP response. Used when the FaaS service is operating as an HTTP server.</dd>
-
         </dl>
 
 
@@ -160,29 +155,28 @@ <h3 class="phpdocumentor-elements__header" id="constants">
             <a href="classes/Nitric-Faas-Faas.html#constants" class="headerlink"><i class="fas fa-link"></i></a>
         </h3>
                     <article class="phpdocumentor-element -constant -private ">
-    <h4 class="phpdocumentor-element__name" id="constant_CHILD_ADDRESS">
-        CHILD_ADDRESS
-        <a href="classes/Nitric-Faas-Faas.html#constant_CHILD_ADDRESS" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="constant_SERVICE_ADDRESS">
+        SERVICE_ADDRESS
+        <a href="classes/Nitric-Faas-Faas.html#constant_SERVICE_ADDRESS" class="headerlink"><i class="fas fa-link"></i></a>
     </h4>
 
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Faas.php"><a href="files/nitric-faas-faas.html"><abbr title="Nitric/Faas/Faas.php">Faas.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">39</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">41</span>
 
-        <p class="phpdocumentor-summary">Bind address for the FaaS service, defaults to &quot;127.0.0.1:8080&quot;.</p>
+    </aside>
 
+    
     <code class="phpdocumentor-signature phpdocumentor-code ">
     <span class="phpdocumentor-signature__visibility">private</span>
     <span class="phpdocumentor-signature__type">mixed</span>
-    <span class="phpdocumentor-signature__name">CHILD_ADDRESS</span>
-    = <span class="phpdocumentor-signature__default-value">&quot;CHILD_ADDRESS&quot;</span>
+    <span class="phpdocumentor-signature__name">SERVICE_ADDRESS</span>
+    = <span class="phpdocumentor-signature__default-value">&quot;SERVICE_ADDRESS&quot;</span>
 </code>
 
 
-        <section class="phpdocumentor-description"><p>Can be modified via CHILD_ADDRESS environment variable.</p>
-</section>
+        <section class="phpdocumentor-description"></section>
 
         <section class="phpdocumentor-description"></section>
 
@@ -211,8 +205,9 @@ <h4 class="phpdocumentor-element__name" id="method_start">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Faas.php"><a href="files/nitric-faas-faas.html"><abbr title="Nitric/Faas/Faas.php">Faas.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">48</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">50</span>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Begin handling FaaS triggers such as HTTP requests and Events.</p>
 
@@ -265,55 +260,71 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
             &mdash;
         
     
-</article>
-                    <article
-        class="phpdocumentor-element
-            -method
-            -private
-                                    -static                    "
->
-    <h4 class="phpdocumentor-element__name" id="method_httpResponse">
-        httpResponse()
-        <a href="classes/Nitric-Faas-Faas.html#method_httpResponse" class="headerlink"><i class="fas fa-link"></i></a>
-    </h4>
-    <aside class="phpdocumentor-element-found-in">
-    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Faas.php"><a href="files/nitric-faas-faas.html"><abbr title="Nitric/Faas/Faas.php">Faas.php</abbr></a></abbr>
-    :
-    <span class="phpdocumentor-element-found-in__line">101</span>
-</aside>
-
-        <p class="phpdocumentor-summary">Convert a NitricResponse to a HTTP response. Used when the FaaS service is operating as an HTTP server.</p>
-
-    <code class="phpdocumentor-code phpdocumentor-signature ">
-    <span class="phpdocumentor-signature__visibility">private</span>
-            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">httpResponse</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><a href="classes/Nitric-Faas-Response.html"><abbr title="\Nitric\Faas\Response">Response</abbr></a>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$response</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><abbr title="\Amp\Http\Server\Response">Response</abbr></span></code>
-
-    
-        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
-    <dl class="phpdocumentor-argument-list">
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$response</span>
-                : <span class="phpdocumentor-signature__argument__return-type"><a href="classes/Nitric-Faas-Response.html"><abbr title="\Nitric\Faas\Response">Response</abbr></a></span>
-                            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                    <section class="phpdocumentor-description"><p>to be converted</p>
-</section>
-
-            </dd>
-            </dl>
-
-    
-
-        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type"><abbr title="\Amp\Http\Server\Response">Response</abbr></span>
-            &mdash;
-            <section class="phpdocumentor-description"><p>HTTP response representing the input response</p>
-</section>
-
-    
 </article>
             </section>
 
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -338,5 +349,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Faas-HttpContext.html b/docs/classes/Nitric-Faas-HttpContext.html
new file mode 100644
index 0000000..b4b667e
--- /dev/null
+++ b/docs/classes/Nitric-Faas-HttpContext.html
@@ -0,0 +1,949 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Documentation</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <base href="../">
+    <link rel="icon" href="images/favicon.ico"/>
+    <link rel="stylesheet" href="css/normalize.css">
+    <link rel="stylesheet" href="css/base.css">
+            <link rel="preconnect" href="https://fonts.gstatic.com">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link rel="stylesheet" href="css/template.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
+                <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
+        <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
+        <script src="js/search.js"></script>
+        <script defer src="js/searchIndex.js"></script>
+    </head>
+<body id="top">
+    <header class="phpdocumentor-header phpdocumentor-section">
+    <h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Documentation</a></h1>
+    <input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
+    <label class="phpdocumentor-header__menu-icon" for="menu-button">
+        <i class="fas fa-bars"></i>
+    </label>
+    <section data-search-form class="phpdocumentor-search">
+    <label>
+        <span class="visually-hidden">Search for</span>
+        <svg class="phpdocumentor-search__icon" width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <circle cx="7.5" cy="7.5" r="6.5" stroke="currentColor" stroke-width="2"/>
+            <line x1="12.4892" y1="12.2727" x2="19.1559" y2="18.9393" stroke="currentColor" stroke-width="3"/>
+        </svg>
+        <input type="search" class="phpdocumentor-field phpdocumentor-search__field" placeholder="Loading .." disabled />
+    </label>
+</section>
+
+    <nav class="phpdocumentor-topnav">
+    <ul class="phpdocumentor-topnav__menu">
+        </ul>
+</nav>
+</header>
+
+    <main class="phpdocumentor">
+        <div class="phpdocumentor-section">
+            <input class="phpdocumentor-sidebar__menu-button" type="checkbox" id="sidebar-button" name="sidebar-button" />
+<label class="phpdocumentor-sidebar__menu-icon" for="sidebar-button">
+    Menu
+</label>
+<aside class="phpdocumentor-column -four phpdocumentor-sidebar">
+        
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Namespaces</h2>
+                                                <h4 class="phpdocumentor-sidebar__root-namespace"><a href="namespaces/nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h4>
+                <ul class="phpdocumentor-list">
+                                            <li><a href="namespaces/nitric-api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                            <li><a href="namespaces/nitric-faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                                    </ul>
+                        </section>
+
+        <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Packages</h2>
+                    <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Default.html"><abbr title="\Default">Default</abbr></a></h3>
+                                <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h3>
+                        <ul class="phpdocumentor-list">
+                                    <li><a href="packages/Nitric-Api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                    <li><a href="packages/Nitric-Faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                            </ul>
+                        </section>
+    
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Reports</h2>
+                <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/deprecated.html">Deprecated</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/errors.html">Errors</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/markers.html">Markers</a></h3>
+    </section>
+
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Indices</h2>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="indices/files.html">Files</a></h3>
+    </section>
+</aside>
+
+            <div class="phpdocumentor-column -eight phpdocumentor-content">
+                    <ul class="phpdocumentor-breadcrumbs">
+            <li class="phpdocumentor-breadcrumb"><a href="namespaces/nitric.html">Nitric</a></li>
+            <li class="phpdocumentor-breadcrumb"><a href="namespaces/nitric-faas.html">Faas</a></li>
+    </ul>
+
+    <article class="phpdocumentor-element -class">
+        <h2 class="phpdocumentor-content__title">
+    HttpContext
+
+        <span class="phpdocumentor-element__extends">
+        extends <a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a>
+    </span>
+    
+            <div class="phpdocumentor-element__package">
+            in package
+            <ul class="phpdocumentor-breadcrumbs">
+                                    <li class="phpdocumentor-breadcrumb"><a href="packages/Default.html">Default</a></li>
+                            </ul>
+        </div>
+    
+    
+    </h2>
+
+        <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/HttpContext.php"><a href="files/nitric-faas-httpcontext.html"><abbr title="Nitric/Faas/HttpContext.php">HttpContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">23</span>
+
+    </aside>
+
+            <p class="phpdocumentor-summary">Class Context represents the metadata of a FaaS request</p>
+
+
+
+
+
+
+
+
+
+<h3 id="toc">
+    Table of Contents
+    <a href="#toc" class="headerlink"><i class="fas fa-link"></i></a>
+</h3>
+
+<dl class="phpdocumentor-table-of-contents">
+                <dt class="phpdocumentor-table-of-contents__entry -property -private">
+    <a href="classes/Nitric-Faas-HttpContext.html#property_headers">$headers</a>
+    <span>
+                &nbsp;: array&lt;string|int, mixed&gt;            </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -property -private">
+    <a href="classes/Nitric-Faas-HttpContext.html#property_method">$method</a>
+    <span>
+                &nbsp;: string            </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -property -private">
+    <a href="classes/Nitric-Faas-HttpContext.html#property_pathParams">$pathParams</a>
+    <span>
+                &nbsp;: array&lt;string|int, mixed&gt;            </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -property -private">
+    <a href="classes/Nitric-Faas-HttpContext.html#property_queryParams">$queryParams</a>
+    <span>
+                &nbsp;: array&lt;string|int, mixed&gt;            </span>
+</dt>
+<dd></dd>
+
+                <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-HttpContext.html#method___construct">__construct()</a>
+    <span>
+                        &nbsp;: mixed    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-Context.html#method_asHttpContext">asHttpContext()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-Context.html#method_asTopicContext">asTopicContext()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-Context.html#method_fromHttpTriggerContext">fromHttpTriggerContext()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-Context.html#method_fromTopicTriggerContext">fromTopicTriggerContext()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-Context.html#method_fromTriggerRequest">fromTriggerRequest()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-HttpContext.html#method_getHeaders">getHeaders()</a>
+    <span>
+                        &nbsp;: mixed    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-HttpContext.html#method_getMethod">getMethod()</a>
+    <span>
+                        &nbsp;: mixed    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-HttpContext.html#method_getPathParams">getPathParams()</a>
+    <span>
+                        &nbsp;: mixed    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-HttpContext.html#method_getQueryParams">getQueryParams()</a>
+    <span>
+                        &nbsp;: mixed    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-Context.html#method_isHttp">isHttp()</a>
+    <span>
+                        &nbsp;: bool    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-Context.html#method_isTopic">isTopic()</a>
+    <span>
+                        &nbsp;: bool    </span>
+</dt>
+<dd></dd>
+
+        </dl>
+
+
+
+        
+
+        
+    <section class="phpdocumentor-properties">
+        <h3 class="phpdocumentor-elements__header" id="properties">
+            Properties
+            <a href="classes/Nitric-Faas-HttpContext.html#properties" class="headerlink"><i class="fas fa-link"></i></a>
+        </h3>
+                    <article
+        class="
+            phpdocumentor-element
+            -property
+            -private
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="property_headers">
+        $headers
+        <a href="classes/Nitric-Faas-HttpContext.html#property_headers" class="headerlink"><i class="fas fa-link"></i></a>
+        <span class="phpdocumentor-element__modifiers">
+                                </span>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/HttpContext.php"><a href="files/nitric-faas-httpcontext.html"><abbr title="Nitric/Faas/HttpContext.php">HttpContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">26</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">private</span>
+        <span class="phpdocumentor-signature__type">array&lt;string|int, mixed&gt;</span>
+    <span class="phpdocumentor-signature__name">$headers</span>
+    </code>
+
+        <section class="phpdocumentor-description"></section>
+
+        <section class="phpdocumentor-description"></section>
+
+    
+
+</article>
+                    <article
+        class="
+            phpdocumentor-element
+            -property
+            -private
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="property_method">
+        $method
+        <a href="classes/Nitric-Faas-HttpContext.html#property_method" class="headerlink"><i class="fas fa-link"></i></a>
+        <span class="phpdocumentor-element__modifiers">
+                                </span>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/HttpContext.php"><a href="files/nitric-faas-httpcontext.html"><abbr title="Nitric/Faas/HttpContext.php">HttpContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">25</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">private</span>
+        <span class="phpdocumentor-signature__type">string</span>
+    <span class="phpdocumentor-signature__name">$method</span>
+    </code>
+
+        <section class="phpdocumentor-description"></section>
+
+        <section class="phpdocumentor-description"></section>
+
+    
+
+</article>
+                    <article
+        class="
+            phpdocumentor-element
+            -property
+            -private
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="property_pathParams">
+        $pathParams
+        <a href="classes/Nitric-Faas-HttpContext.html#property_pathParams" class="headerlink"><i class="fas fa-link"></i></a>
+        <span class="phpdocumentor-element__modifiers">
+                                </span>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/HttpContext.php"><a href="files/nitric-faas-httpcontext.html"><abbr title="Nitric/Faas/HttpContext.php">HttpContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">28</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">private</span>
+        <span class="phpdocumentor-signature__type">array&lt;string|int, mixed&gt;</span>
+    <span class="phpdocumentor-signature__name">$pathParams</span>
+    </code>
+
+        <section class="phpdocumentor-description"></section>
+
+        <section class="phpdocumentor-description"></section>
+
+    
+
+</article>
+                    <article
+        class="
+            phpdocumentor-element
+            -property
+            -private
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="property_queryParams">
+        $queryParams
+        <a href="classes/Nitric-Faas-HttpContext.html#property_queryParams" class="headerlink"><i class="fas fa-link"></i></a>
+        <span class="phpdocumentor-element__modifiers">
+                                </span>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/HttpContext.php"><a href="files/nitric-faas-httpcontext.html"><abbr title="Nitric/Faas/HttpContext.php">HttpContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">27</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">private</span>
+        <span class="phpdocumentor-signature__type">array&lt;string|int, mixed&gt;</span>
+    <span class="phpdocumentor-signature__name">$queryParams</span>
+    </code>
+
+        <section class="phpdocumentor-description"></section>
+
+        <section class="phpdocumentor-description"></section>
+
+    
+
+</article>
+            </section>
+
+            <section class="phpdocumentor-methods">
+        <h3 class="phpdocumentor-elements__header" id="methods">
+            Methods
+            <a href="classes/Nitric-Faas-HttpContext.html#methods" class="headerlink"><i class="fas fa-link"></i></a>
+        </h3>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method___construct">
+        __construct()
+        <a href="classes/Nitric-Faas-HttpContext.html#method___construct" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/HttpContext.php"><a href="files/nitric-faas-httpcontext.html"><abbr title="Nitric/Faas/HttpContext.php">HttpContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">30</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">__construct</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$method</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type">array&lt;string|int, mixed&gt;&nbsp;</span><span class="phpdocumentor-signature__argument__name">$headers</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type">array&lt;string|int, mixed&gt;&nbsp;</span><span class="phpdocumentor-signature__argument__name">$queryParams</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type">array&lt;string|int, mixed&gt;&nbsp;</span><span class="phpdocumentor-signature__argument__name">$pathParams</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
+
+        <section class="phpdocumentor-description"></section>
+
+        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
+    <dl class="phpdocumentor-argument-list">
+                    <dt class="phpdocumentor-argument-list__entry">
+                <span class="phpdocumentor-signature__argument__name">$method</span>
+                : <span class="phpdocumentor-signature__argument__return-type">string</span>
+                            </dt>
+            <dd class="phpdocumentor-argument-list__definition">
+                    <section class="phpdocumentor-description"></section>
+
+            </dd>
+                    <dt class="phpdocumentor-argument-list__entry">
+                <span class="phpdocumentor-signature__argument__name">$headers</span>
+                : <span class="phpdocumentor-signature__argument__return-type">array&lt;string|int, mixed&gt;</span>
+                            </dt>
+            <dd class="phpdocumentor-argument-list__definition">
+                    <section class="phpdocumentor-description"></section>
+
+            </dd>
+                    <dt class="phpdocumentor-argument-list__entry">
+                <span class="phpdocumentor-signature__argument__name">$queryParams</span>
+                : <span class="phpdocumentor-signature__argument__return-type">array&lt;string|int, mixed&gt;</span>
+                            </dt>
+            <dd class="phpdocumentor-argument-list__definition">
+                    <section class="phpdocumentor-description"></section>
+
+            </dd>
+                    <dt class="phpdocumentor-argument-list__entry">
+                <span class="phpdocumentor-signature__argument__name">$pathParams</span>
+                : <span class="phpdocumentor-signature__argument__return-type">array&lt;string|int, mixed&gt;</span>
+                            </dt>
+            <dd class="phpdocumentor-argument-list__definition">
+                    <section class="phpdocumentor-description"></section>
+
+            </dd>
+            </dl>
+
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">mixed</span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_asHttpContext">
+        asHttpContext()
+        <a href="classes/Nitric-Faas-Context.html#method_asHttpContext" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">62</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">asHttpContext</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_asTopicContext">
+        asTopicContext()
+        <a href="classes/Nitric-Faas-Context.html#method_asTopicContext" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">51</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">asTopicContext</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                    -static                    "
+>
+    <h4 class="phpdocumentor-element__name" id="method_fromHttpTriggerContext">
+        fromHttpTriggerContext()
+        <a href="classes/Nitric-Faas-Context.html#method_fromHttpTriggerContext" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">74</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">fromHttpTriggerContext</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\HttpTriggerContext">HttpTriggerContext</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$context</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a></span></code>
+
+    
+        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
+    <dl class="phpdocumentor-argument-list">
+                    <dt class="phpdocumentor-argument-list__entry">
+                <span class="phpdocumentor-signature__argument__name">$context</span>
+                : <span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\HttpTriggerContext">HttpTriggerContext</abbr></span>
+                            </dt>
+            <dd class="phpdocumentor-argument-list__definition">
+                    <section class="phpdocumentor-description"></section>
+
+            </dd>
+            </dl>
+
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                    -static                    "
+>
+    <h4 class="phpdocumentor-element__name" id="method_fromTopicTriggerContext">
+        fromTopicTriggerContext()
+        <a href="classes/Nitric-Faas-Context.html#method_fromTopicTriggerContext" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">87</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">fromTopicTriggerContext</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\TopicTriggerContext">TopicTriggerContext</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$context</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a></span></code>
+
+    
+        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
+    <dl class="phpdocumentor-argument-list">
+                    <dt class="phpdocumentor-argument-list__entry">
+                <span class="phpdocumentor-signature__argument__name">$context</span>
+                : <span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\TopicTriggerContext">TopicTriggerContext</abbr></span>
+                            </dt>
+            <dd class="phpdocumentor-argument-list__definition">
+                    <section class="phpdocumentor-description"></section>
+
+            </dd>
+            </dl>
+
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                    -static                    "
+>
+    <h4 class="phpdocumentor-element__name" id="method_fromTriggerRequest">
+        fromTriggerRequest()
+        <a href="classes/Nitric-Faas-Context.html#method_fromTriggerRequest" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">97</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">fromTriggerRequest</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\TriggerRequest">TriggerRequest</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$request</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a></span></code>
+
+    
+        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
+    <dl class="phpdocumentor-argument-list">
+                    <dt class="phpdocumentor-argument-list__entry">
+                <span class="phpdocumentor-signature__argument__name">$request</span>
+                : <span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\TriggerRequest">TriggerRequest</abbr></span>
+                            </dt>
+            <dd class="phpdocumentor-argument-list__definition">
+                    <section class="phpdocumentor-description"></section>
+
+            </dd>
+            </dl>
+
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_getHeaders">
+        getHeaders()
+        <a href="classes/Nitric-Faas-HttpContext.html#method_getHeaders" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/HttpContext.php"><a href="files/nitric-faas-httpcontext.html"><abbr title="Nitric/Faas/HttpContext.php">HttpContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">47</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">getHeaders</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
+
+        <section class="phpdocumentor-description"></section>
+
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">mixed</span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_getMethod">
+        getMethod()
+        <a href="classes/Nitric-Faas-HttpContext.html#method_getMethod" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/HttpContext.php"><a href="files/nitric-faas-httpcontext.html"><abbr title="Nitric/Faas/HttpContext.php">HttpContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">42</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">getMethod</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
+
+        <section class="phpdocumentor-description"></section>
+
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">mixed</span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_getPathParams">
+        getPathParams()
+        <a href="classes/Nitric-Faas-HttpContext.html#method_getPathParams" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/HttpContext.php"><a href="files/nitric-faas-httpcontext.html"><abbr title="Nitric/Faas/HttpContext.php">HttpContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">57</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">getPathParams</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
+
+        <section class="phpdocumentor-description"></section>
+
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">mixed</span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_getQueryParams">
+        getQueryParams()
+        <a href="classes/Nitric-Faas-HttpContext.html#method_getQueryParams" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/HttpContext.php"><a href="files/nitric-faas-httpcontext.html"><abbr title="Nitric/Faas/HttpContext.php">HttpContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">52</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">getQueryParams</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
+
+        <section class="phpdocumentor-description"></section>
+
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">mixed</span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_isHttp">
+        isHttp()
+        <a href="classes/Nitric-Faas-Context.html#method_isHttp" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">43</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">isHttp</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">bool</span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">bool</span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_isTopic">
+        isTopic()
+        <a href="classes/Nitric-Faas-Context.html#method_isTopic" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">35</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">isTopic</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">bool</span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">bool</span>
+            &mdash;
+        
+    
+</article>
+            </section>
+
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
+    </article>
+                <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
+    <section class="phpdocumentor-search-results__dialog">
+        <header class="phpdocumentor-search-results__header">
+            <h2 class="phpdocumentor-search-results__title">Search results</h2>
+            <button class="phpdocumentor-search-results__close"><i class="fas fa-times"></i></button>
+        </header>
+        <section class="phpdocumentor-search-results__body">
+            <ul class="phpdocumentor-search-results__entries"></ul>
+        </section>
+    </section>
+</section>
+            </div>
+        </div>
+        <a href="classes/Nitric-Faas-HttpContext.html#top" class="phpdocumentor-back-to-top"><i class="fas fa-chevron-circle-up"></i></a>
+
+    </main>
+
+    <script>
+        cssVars({});
+    </script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
+</body>
+</html>
diff --git a/docs/classes/Nitric-Faas-HttpResponseContext.html b/docs/classes/Nitric-Faas-HttpResponseContext.html
new file mode 100644
index 0000000..39966a3
--- /dev/null
+++ b/docs/classes/Nitric-Faas-HttpResponseContext.html
@@ -0,0 +1,639 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Documentation</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <base href="../">
+    <link rel="icon" href="images/favicon.ico"/>
+    <link rel="stylesheet" href="css/normalize.css">
+    <link rel="stylesheet" href="css/base.css">
+            <link rel="preconnect" href="https://fonts.gstatic.com">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link rel="stylesheet" href="css/template.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
+                <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
+        <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
+        <script src="js/search.js"></script>
+        <script defer src="js/searchIndex.js"></script>
+    </head>
+<body id="top">
+    <header class="phpdocumentor-header phpdocumentor-section">
+    <h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Documentation</a></h1>
+    <input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
+    <label class="phpdocumentor-header__menu-icon" for="menu-button">
+        <i class="fas fa-bars"></i>
+    </label>
+    <section data-search-form class="phpdocumentor-search">
+    <label>
+        <span class="visually-hidden">Search for</span>
+        <svg class="phpdocumentor-search__icon" width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <circle cx="7.5" cy="7.5" r="6.5" stroke="currentColor" stroke-width="2"/>
+            <line x1="12.4892" y1="12.2727" x2="19.1559" y2="18.9393" stroke="currentColor" stroke-width="3"/>
+        </svg>
+        <input type="search" class="phpdocumentor-field phpdocumentor-search__field" placeholder="Loading .." disabled />
+    </label>
+</section>
+
+    <nav class="phpdocumentor-topnav">
+    <ul class="phpdocumentor-topnav__menu">
+        </ul>
+</nav>
+</header>
+
+    <main class="phpdocumentor">
+        <div class="phpdocumentor-section">
+            <input class="phpdocumentor-sidebar__menu-button" type="checkbox" id="sidebar-button" name="sidebar-button" />
+<label class="phpdocumentor-sidebar__menu-icon" for="sidebar-button">
+    Menu
+</label>
+<aside class="phpdocumentor-column -four phpdocumentor-sidebar">
+        
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Namespaces</h2>
+                                                <h4 class="phpdocumentor-sidebar__root-namespace"><a href="namespaces/nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h4>
+                <ul class="phpdocumentor-list">
+                                            <li><a href="namespaces/nitric-api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                            <li><a href="namespaces/nitric-faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                                    </ul>
+                        </section>
+
+        <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Packages</h2>
+                    <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Default.html"><abbr title="\Default">Default</abbr></a></h3>
+                                <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h3>
+                        <ul class="phpdocumentor-list">
+                                    <li><a href="packages/Nitric-Api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                    <li><a href="packages/Nitric-Faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                            </ul>
+                        </section>
+    
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Reports</h2>
+                <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/deprecated.html">Deprecated</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/errors.html">Errors</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/markers.html">Markers</a></h3>
+    </section>
+
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Indices</h2>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="indices/files.html">Files</a></h3>
+    </section>
+</aside>
+
+            <div class="phpdocumentor-column -eight phpdocumentor-content">
+                    <ul class="phpdocumentor-breadcrumbs">
+            <li class="phpdocumentor-breadcrumb"><a href="namespaces/nitric.html">Nitric</a></li>
+            <li class="phpdocumentor-breadcrumb"><a href="namespaces/nitric-faas.html">Faas</a></li>
+    </ul>
+
+    <article class="phpdocumentor-element -class">
+        <h2 class="phpdocumentor-content__title">
+    HttpResponseContext
+
+        <span class="phpdocumentor-element__extends">
+        extends <a href="classes/Nitric-Faas-ResponseContext.html"><abbr title="\Nitric\Faas\ResponseContext">ResponseContext</abbr></a>
+    </span>
+    
+            <div class="phpdocumentor-element__package">
+            in package
+            <ul class="phpdocumentor-breadcrumbs">
+                                    <li class="phpdocumentor-breadcrumb"><a href="packages/Default.html">Default</a></li>
+                            </ul>
+        </div>
+    
+    
+    </h2>
+
+        <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/HttpResponseContext.php"><a href="files/nitric-faas-httpresponsecontext.html"><abbr title="Nitric/Faas/HttpResponseContext.php">HttpResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">24</span>
+
+    </aside>
+
+        
+    <section class="phpdocumentor-description"></section>
+
+
+
+
+
+
+
+
+<h3 id="toc">
+    Table of Contents
+    <a href="#toc" class="headerlink"><i class="fas fa-link"></i></a>
+</h3>
+
+<dl class="phpdocumentor-table-of-contents">
+                <dt class="phpdocumentor-table-of-contents__entry -property -public">
+    <a href="classes/Nitric-Faas-HttpResponseContext.html#property_headers">$headers</a>
+    <span>
+                &nbsp;: array&lt;string|int, mixed&gt;            </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -property -public">
+    <a href="classes/Nitric-Faas-HttpResponseContext.html#property_status">$status</a>
+    <span>
+                &nbsp;: mixed            </span>
+</dt>
+<dd></dd>
+
+                <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-HttpResponseContext.html#method___construct">__construct()</a>
+    <span>
+                        &nbsp;: mixed    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_asHttp">asHttp()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_asTopic">asTopic()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_http">http()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_isHttp">isHttp()</a>
+    <span>
+                        &nbsp;: bool    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_isTopic">isTopic()</a>
+    <span>
+                        &nbsp;: bool    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-HttpResponseContext.html#method_toGrpcResponseContext">toGrpcResponseContext()</a>
+    <span>
+                        &nbsp;: <abbr title="\Nitric\Faas\Nitric\Proto\Faas\V1\HttpResponseContext">HttpResponseContext</abbr>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_topic">topic()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+        </dl>
+
+
+
+        
+
+        
+    <section class="phpdocumentor-properties">
+        <h3 class="phpdocumentor-elements__header" id="properties">
+            Properties
+            <a href="classes/Nitric-Faas-HttpResponseContext.html#properties" class="headerlink"><i class="fas fa-link"></i></a>
+        </h3>
+                    <article
+        class="
+            phpdocumentor-element
+            -property
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="property_headers">
+        $headers
+        <a href="classes/Nitric-Faas-HttpResponseContext.html#property_headers" class="headerlink"><i class="fas fa-link"></i></a>
+        <span class="phpdocumentor-element__modifiers">
+                                </span>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/HttpResponseContext.php"><a href="files/nitric-faas-httpresponsecontext.html"><abbr title="Nitric/Faas/HttpResponseContext.php">HttpResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">26</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+        <span class="phpdocumentor-signature__type">array&lt;string|int, mixed&gt;</span>
+    <span class="phpdocumentor-signature__name">$headers</span>
+     = <span class="phpdocumentor-signature__default-value">[]</span></code>
+
+        <section class="phpdocumentor-description"></section>
+
+        <section class="phpdocumentor-description"></section>
+
+    
+
+</article>
+                    <article
+        class="
+            phpdocumentor-element
+            -property
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="property_status">
+        $status
+        <a href="classes/Nitric-Faas-HttpResponseContext.html#property_status" class="headerlink"><i class="fas fa-link"></i></a>
+        <span class="phpdocumentor-element__modifiers">
+                                </span>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/HttpResponseContext.php"><a href="files/nitric-faas-httpresponsecontext.html"><abbr title="Nitric/Faas/HttpResponseContext.php">HttpResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">27</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+        <span class="phpdocumentor-signature__type">mixed</span>
+    <span class="phpdocumentor-signature__name">$status</span>
+     = <span class="phpdocumentor-signature__default-value">200</span></code>
+
+        <section class="phpdocumentor-description"></section>
+
+        <section class="phpdocumentor-description"></section>
+
+    
+
+</article>
+            </section>
+
+            <section class="phpdocumentor-methods">
+        <h3 class="phpdocumentor-elements__header" id="methods">
+            Methods
+            <a href="classes/Nitric-Faas-HttpResponseContext.html#methods" class="headerlink"><i class="fas fa-link"></i></a>
+        </h3>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method___construct">
+        __construct()
+        <a href="classes/Nitric-Faas-HttpResponseContext.html#method___construct" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/HttpResponseContext.php"><a href="files/nitric-faas-httpresponsecontext.html"><abbr title="Nitric/Faas/HttpResponseContext.php">HttpResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">29</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">__construct</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
+
+        <section class="phpdocumentor-description"></section>
+
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">mixed</span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_asHttp">
+        asHttp()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_asHttp" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">43</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">asHttp</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_asTopic">
+        asTopic()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_asTopic" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">53</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">asTopic</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                    -static                    "
+>
+    <h4 class="phpdocumentor-element__name" id="method_http">
+        http()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_http" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">63</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">http</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_isHttp">
+        isHttp()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_isHttp" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">27</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">isHttp</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">bool</span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">bool</span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_isTopic">
+        isTopic()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_isTopic" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">35</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">isTopic</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">bool</span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">bool</span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_toGrpcResponseContext">
+        toGrpcResponseContext()
+        <a href="classes/Nitric-Faas-HttpResponseContext.html#method_toGrpcResponseContext" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/HttpResponseContext.php"><a href="files/nitric-faas-httpresponsecontext.html"><abbr title="Nitric/Faas/HttpResponseContext.php">HttpResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">36</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">toGrpcResponseContext</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><abbr title="\Nitric\Faas\Nitric\Proto\Faas\V1\HttpResponseContext">HttpResponseContext</abbr></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><abbr title="\Nitric\Faas\Nitric\Proto\Faas\V1\HttpResponseContext">HttpResponseContext</abbr></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                    -static                    "
+>
+    <h4 class="phpdocumentor-element__name" id="method_topic">
+        topic()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_topic" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">71</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">topic</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+            </section>
+
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
+    </article>
+                <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
+    <section class="phpdocumentor-search-results__dialog">
+        <header class="phpdocumentor-search-results__header">
+            <h2 class="phpdocumentor-search-results__title">Search results</h2>
+            <button class="phpdocumentor-search-results__close"><i class="fas fa-times"></i></button>
+        </header>
+        <section class="phpdocumentor-search-results__body">
+            <ul class="phpdocumentor-search-results__entries"></ul>
+        </section>
+    </section>
+</section>
+            </div>
+        </div>
+        <a href="classes/Nitric-Faas-HttpResponseContext.html#top" class="phpdocumentor-back-to-top"><i class="fas fa-chevron-circle-up"></i></a>
+
+    </main>
+
+    <script>
+        cssVars({});
+    </script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
+</body>
+</html>
diff --git a/docs/classes/Nitric-Faas-Logger.html b/docs/classes/Nitric-Faas-Logger.html
index 368658a..3df6fc6 100644
--- a/docs/classes/Nitric-Faas-Logger.html
+++ b/docs/classes/Nitric-Faas-Logger.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -113,7 +114,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Logger.php"><a href="files/nitric-faas-logger.html"><abbr title="Nitric/Faas/Logger.php">Logger.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class Logger provides a basic logger implementation, enabling the FaaS HTTP server to print to stdout.</p>
 
@@ -172,7 +174,8 @@ <h4 class="phpdocumentor-element__name" id="method_interpolate">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Logger.php"><a href="files/nitric-faas-logger.html"><abbr title="Nitric/Faas/Logger.php">Logger.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">35</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Combine a message and its context into a static string.</p>
 
@@ -227,7 +230,8 @@ <h4 class="phpdocumentor-element__name" id="method_log">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Logger.php"><a href="files/nitric-faas-logger.html"><abbr title="Nitric/Faas/Logger.php">Logger.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">50</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Log output to stdout (printf) in the format: `{level}: {message}\n{exception}`.</p>
 
@@ -277,6 +281,68 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
 </article>
             </section>
 
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -301,5 +367,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Faas-Request.html b/docs/classes/Nitric-Faas-Request.html
index 518bdb4..9c53331 100644
--- a/docs/classes/Nitric-Faas-Request.html
+++ b/docs/classes/Nitric-Faas-Request.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -109,8 +110,9 @@ <h2 class="phpdocumentor-content__title">
         <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Request.php"><a href="files/nitric-faas-request.html"><abbr title="Nitric/Faas/Request.php">Request.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">25</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">27</span>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class Request represents a normalized request in the Nitric runtime.</p>
 
@@ -136,14 +138,7 @@ <h3 id="toc">
 <dd></dd>
 
             <dt class="phpdocumentor-table-of-contents__entry -property -private">
-    <a href="classes/Nitric-Faas-Request.html#property_path">$path</a>
-    <span>
-                &nbsp;: string            </span>
-</dt>
-<dd></dd>
-
-            <dt class="phpdocumentor-table-of-contents__entry -property -private">
-    <a href="classes/Nitric-Faas-Request.html#property_payload">$payload</a>
+    <a href="classes/Nitric-Faas-Request.html#property_data">$data</a>
     <span>
                 &nbsp;: string            </span>
 </dt>
@@ -157,12 +152,11 @@ <h3 id="toc">
 <dd>Request constructor.</dd>
 
             <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Request.html#method_fromHTTPRequest">fromHTTPRequest()</a>
+    <a href="classes/Nitric-Faas-Request.html#method_fromTriggerRequest">fromTriggerRequest()</a>
     <span>
                         &nbsp;: <a href="classes/Nitric-Faas-Request.html"><abbr title="\Nitric\Faas\Request">Request</abbr></a>    </span>
 </dt>
-<dd>Return a Request from an HTTP request using standard conventions. Used when FaaS services is operating as
-an HTTP server.</dd>
+<dd>Return a Request from an NitricTriggerRequest</dd>
 
             <dt class="phpdocumentor-table-of-contents__entry -method -public">
     <a href="classes/Nitric-Faas-Request.html#method_getContext">getContext()</a>
@@ -172,37 +166,16 @@ <h3 id="toc">
 <dd></dd>
 
             <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Request.html#method_getPath">getPath()</a>
-    <span>
-                        &nbsp;: string    </span>
-</dt>
-<dd></dd>
-
-            <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Request.html#method_getPayload">getPayload()</a>
+    <a href="classes/Nitric-Faas-Request.html#method_getData">getData()</a>
     <span>
                         &nbsp;: string    </span>
 </dt>
 <dd></dd>
 
             <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Request.html#method_setContext">setContext()</a>
-    <span>
-                        &nbsp;: void    </span>
-</dt>
-<dd></dd>
-
-            <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Request.html#method_setPath">setPath()</a>
-    <span>
-                        &nbsp;: void    </span>
-</dt>
-<dd></dd>
-
-            <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Request.html#method_setPayload">setPayload()</a>
+    <a href="classes/Nitric-Faas-Request.html#method_getDefaultResponse">getDefaultResponse()</a>
     <span>
-                        &nbsp;: void    </span>
+                        &nbsp;: <a href="classes/Nitric-Faas-Response.html"><abbr title="\Nitric\Faas\Response">Response</abbr></a>    </span>
 </dt>
 <dd></dd>
 
@@ -234,8 +207,9 @@ <h4 class="phpdocumentor-element__name" id="property_context">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Request.php"><a href="files/nitric-faas-request.html"><abbr title="Nitric/Faas/Request.php">Request.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">27</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">29</span>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -258,56 +232,24 @@ <h4 class="phpdocumentor-element__name" id="property_context">
             -private
                                                         "
 >
-    <h4 class="phpdocumentor-element__name" id="property_path">
-        $path
-        <a href="classes/Nitric-Faas-Request.html#property_path" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="property_data">
+        $data
+        <a href="classes/Nitric-Faas-Request.html#property_data" class="headerlink"><i class="fas fa-link"></i></a>
         <span class="phpdocumentor-element__modifiers">
                                 </span>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Request.php"><a href="files/nitric-faas-request.html"><abbr title="Nitric/Faas/Request.php">Request.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">29</span>
-</aside>
-
-    
-    <code class="phpdocumentor-code phpdocumentor-signature ">
-    <span class="phpdocumentor-signature__visibility">private</span>
-        <span class="phpdocumentor-signature__type">string</span>
-    <span class="phpdocumentor-signature__name">$path</span>
-    </code>
-
-        <section class="phpdocumentor-description"></section>
-
-        <section class="phpdocumentor-description"></section>
-
-    
+    <span class="phpdocumentor-element-found-in__line">30</span>
 
-</article>
-                    <article
-        class="
-            phpdocumentor-element
-            -property
-            -private
-                                                        "
->
-    <h4 class="phpdocumentor-element__name" id="property_payload">
-        $payload
-        <a href="classes/Nitric-Faas-Request.html#property_payload" class="headerlink"><i class="fas fa-link"></i></a>
-        <span class="phpdocumentor-element__modifiers">
-                                </span>
-    </h4>
-    <aside class="phpdocumentor-element-found-in">
-    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Request.php"><a href="files/nitric-faas-request.html"><abbr title="Nitric/Faas/Request.php">Request.php</abbr></a></abbr>
-    :
-    <span class="phpdocumentor-element-found-in__line">28</span>
-</aside>
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">private</span>
         <span class="phpdocumentor-signature__type">string</span>
-    <span class="phpdocumentor-signature__name">$payload</span>
+    <span class="phpdocumentor-signature__name">$data</span>
     </code>
 
         <section class="phpdocumentor-description"></section>
@@ -337,14 +279,15 @@ <h4 class="phpdocumentor-element__name" id="method___construct">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Request.php"><a href="files/nitric-faas-request.html"><abbr title="Nitric/Faas/Request.php">Request.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">38</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">39</span>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Request constructor.</p>
 
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">__construct</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$context</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$payload</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$path</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
+                <span class="phpdocumentor-signature__name">__construct</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$context</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$data</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
 
     
         <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
@@ -357,18 +300,12 @@ <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
                 
             </dd>
                     <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$payload</span>
+                <span class="phpdocumentor-signature__argument__name">$data</span>
                 : <span class="phpdocumentor-signature__argument__return-type">string</span>
                             </dt>
             <dd class="phpdocumentor-argument-list__definition">
-                
-            </dd>
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$path</span>
-                : <span class="phpdocumentor-signature__argument__return-type">string</span>
-                            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                
+                    <section class="phpdocumentor-description"></section>
+
             </dd>
             </dl>
 
@@ -386,43 +323,29 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
             -public
                                     -static                    "
 >
-    <h4 class="phpdocumentor-element__name" id="method_fromHTTPRequest">
-        fromHTTPRequest()
-        <a href="classes/Nitric-Faas-Request.html#method_fromHTTPRequest" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="method_fromTriggerRequest">
+        fromTriggerRequest()
+        <a href="classes/Nitric-Faas-Request.html#method_fromTriggerRequest" class="headerlink"><i class="fas fa-link"></i></a>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Request.php"><a href="files/nitric-faas-request.html"><abbr title="Nitric/Faas/Request.php">Request.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">54</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">50</span>
 
-        <p class="phpdocumentor-summary">Return a Request from an HTTP request using standard conventions. Used when FaaS services is operating as
-an HTTP server.</p>
+    </aside>
+
+        <p class="phpdocumentor-summary">Return a Request from an NitricTriggerRequest</p>
 
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">public</span>
-            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">fromHTTPRequest</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type">array&lt;string|int, mixed&gt;&nbsp;</span><span class="phpdocumentor-signature__argument__name">$headers</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$payload</span></span><span class="phpdocumentor-signature__argument"><span>, </span><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$path</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Request.html"><abbr title="\Nitric\Faas\Request">Request</abbr></a></span></code>
+            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">fromTriggerRequest</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\TriggerRequest">TriggerRequest</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$request</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Request.html"><abbr title="\Nitric\Faas\Request">Request</abbr></a></span></code>
 
     
         <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
     <dl class="phpdocumentor-argument-list">
                     <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$headers</span>
-                : <span class="phpdocumentor-signature__argument__return-type">array&lt;string|int, mixed&gt;</span>
-                            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                
-            </dd>
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$payload</span>
-                : <span class="phpdocumentor-signature__argument__return-type">string</span>
-                            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                
-            </dd>
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$path</span>
-                : <span class="phpdocumentor-signature__argument__return-type">string</span>
+                <span class="phpdocumentor-signature__argument__name">$request</span>
+                : <span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\TriggerRequest">TriggerRequest</abbr></span>
                             </dt>
             <dd class="phpdocumentor-argument-list__definition">
                 
@@ -450,8 +373,9 @@ <h4 class="phpdocumentor-element__name" id="method_getContext">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Request.php"><a href="files/nitric-faas-request.html"><abbr title="Nitric/Faas/Request.php">Request.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">68</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">63</span>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
@@ -474,51 +398,21 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
             -public
                                                         "
 >
-    <h4 class="phpdocumentor-element__name" id="method_getPath">
-        getPath()
-        <a href="classes/Nitric-Faas-Request.html#method_getPath" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="method_getData">
+        getData()
+        <a href="classes/Nitric-Faas-Request.html#method_getData" class="headerlink"><i class="fas fa-link"></i></a>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Request.php"><a href="files/nitric-faas-request.html"><abbr title="Nitric/Faas/Request.php">Request.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">100</span>
-</aside>
-
-    
-    <code class="phpdocumentor-code phpdocumentor-signature ">
-    <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">getPath</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">string</span></code>
-
-    
-    
-    
+    <span class="phpdocumentor-element-found-in__line">71</span>
 
-        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">string</span>
-            &mdash;
-        
-    
-</article>
-                    <article
-        class="phpdocumentor-element
-            -method
-            -public
-                                                        "
->
-    <h4 class="phpdocumentor-element__name" id="method_getPayload">
-        getPayload()
-        <a href="classes/Nitric-Faas-Request.html#method_getPayload" class="headerlink"><i class="fas fa-link"></i></a>
-    </h4>
-    <aside class="phpdocumentor-element-found-in">
-    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Request.php"><a href="files/nitric-faas-request.html"><abbr title="Nitric/Faas/Request.php">Request.php</abbr></a></abbr>
-    :
-    <span class="phpdocumentor-element-found-in__line">84</span>
-</aside>
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">getPayload</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">string</span></code>
+                <span class="phpdocumentor-signature__name">getData</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">string</span></code>
 
     
     
@@ -536,125 +430,97 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
             -public
                                                         "
 >
-    <h4 class="phpdocumentor-element__name" id="method_setContext">
-        setContext()
-        <a href="classes/Nitric-Faas-Request.html#method_setContext" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="method_getDefaultResponse">
+        getDefaultResponse()
+        <a href="classes/Nitric-Faas-Request.html#method_getDefaultResponse" class="headerlink"><i class="fas fa-link"></i></a>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Request.php"><a href="files/nitric-faas-request.html"><abbr title="Nitric/Faas/Request.php">Request.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">76</span>
-</aside>
-
-    
-    <code class="phpdocumentor-code phpdocumentor-signature ">
-    <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">setContext</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$context</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">void</span></code>
-
-    
-        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
-    <dl class="phpdocumentor-argument-list">
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$context</span>
-                : <span class="phpdocumentor-signature__argument__return-type"><a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a></span>
-                            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                
-            </dd>
-            </dl>
-
-    
 
-        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">void</span>
-            &mdash;
-        
-    
-</article>
-                    <article
-        class="phpdocumentor-element
-            -method
-            -public
-                                                        "
->
-    <h4 class="phpdocumentor-element__name" id="method_setPath">
-        setPath()
-        <a href="classes/Nitric-Faas-Request.html#method_setPath" class="headerlink"><i class="fas fa-link"></i></a>
-    </h4>
-    <aside class="phpdocumentor-element-found-in">
-    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Request.php"><a href="files/nitric-faas-request.html"><abbr title="Nitric/Faas/Request.php">Request.php</abbr></a></abbr>
-    :
-    <span class="phpdocumentor-element-found-in__line">108</span>
-</aside>
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">setPath</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$path</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">void</span></code>
-
-    
-        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
-    <dl class="phpdocumentor-argument-list">
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$path</span>
-                : <span class="phpdocumentor-signature__argument__return-type">string</span>
-                            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                
-            </dd>
-            </dl>
-
-    
-
-        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">void</span>
-            &mdash;
-        
-    
-</article>
-                    <article
-        class="phpdocumentor-element
-            -method
-            -public
-                                                        "
->
-    <h4 class="phpdocumentor-element__name" id="method_setPayload">
-        setPayload()
-        <a href="classes/Nitric-Faas-Request.html#method_setPayload" class="headerlink"><i class="fas fa-link"></i></a>
-    </h4>
-    <aside class="phpdocumentor-element-found-in">
-    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Request.php"><a href="files/nitric-faas-request.html"><abbr title="Nitric/Faas/Request.php">Request.php</abbr></a></abbr>
-    :
-    <span class="phpdocumentor-element-found-in__line">92</span>
-</aside>
+                <span class="phpdocumentor-signature__name">getDefaultResponse</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Response.html"><abbr title="\Nitric\Faas\Response">Response</abbr></a></span></code>
 
-    
-    <code class="phpdocumentor-code phpdocumentor-signature ">
-    <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">setPayload</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$payload</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">void</span></code>
+        <section class="phpdocumentor-description"></section>
 
     
-        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
-    <dl class="phpdocumentor-argument-list">
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$payload</span>
-                : <span class="phpdocumentor-signature__argument__return-type">string</span>
-                            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                
-            </dd>
-            </dl>
-
     
 
         <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">void</span>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Response.html"><abbr title="\Nitric\Faas\Response">Response</abbr></a></span>
             &mdash;
         
     
 </article>
             </section>
 
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -679,5 +545,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Faas-Response.html b/docs/classes/Nitric-Faas-Response.html
index d773796..3c28843 100644
--- a/docs/classes/Nitric-Faas-Response.html
+++ b/docs/classes/Nitric-Faas-Response.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -109,8 +110,9 @@ <h2 class="phpdocumentor-content__title">
         <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Response.php"><a href="files/nitric-faas-response.html"><abbr title="Nitric/Faas/Response.php">Response.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">26</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">31</span>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class Response represents a normalized response in the Nitric runtime. Will be converted to a specific response type
 such as an HTTP response, depending on runtime environment.</p>
@@ -130,72 +132,51 @@ <h3 id="toc">
 
 <dl class="phpdocumentor-table-of-contents">
                 <dt class="phpdocumentor-table-of-contents__entry -property -private">
-    <a href="classes/Nitric-Faas-Response.html#property_body">$body</a>
+    <a href="classes/Nitric-Faas-Response.html#property_context">$context</a>
     <span>
-                &nbsp;: string            </span>
+                &nbsp;: <a href="classes/Nitric-Faas-ResponseContext.html"><abbr title="\Nitric\Faas\ResponseContext">ResponseContext</abbr></a>            </span>
 </dt>
 <dd></dd>
 
             <dt class="phpdocumentor-table-of-contents__entry -property -private">
-    <a href="classes/Nitric-Faas-Response.html#property_headers">$headers</a>
+    <a href="classes/Nitric-Faas-Response.html#property_data">$data</a>
     <span>
-                &nbsp;: array&lt;string|int, mixed&gt;            </span>
-</dt>
-<dd></dd>
-
-            <dt class="phpdocumentor-table-of-contents__entry -property -private">
-    <a href="classes/Nitric-Faas-Response.html#property_status">$status</a>
-    <span>
-                &nbsp;: int            </span>
+                &nbsp;: string            </span>
 </dt>
 <dd></dd>
 
                 <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Response.html#method___construct">__construct()</a>
+    <a href="classes/Nitric-Faas-Response.html#method_getContext">getContext()</a>
     <span>
-                        &nbsp;: mixed    </span>
-</dt>
-<dd>Response constructor.</dd>
-
-            <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Response.html#method_getBody">getBody()</a>
-    <span>
-                        &nbsp;: string    </span>
+                        &nbsp;: <a href="classes/Nitric-Faas-Response.html"><abbr title="\Nitric\Faas\Response">Response</abbr></a>    </span>
 </dt>
 <dd></dd>
 
             <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Response.html#method_getHeaders">getHeaders()</a>
+    <a href="classes/Nitric-Faas-Response.html#method_getData">getData()</a>
     <span>
-                        &nbsp;: array&lt;string|int, string&gt;    </span>
-</dt>
-<dd></dd>
-
-            <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Response.html#method_getStatus">getStatus()</a>
-    <span>
-                        &nbsp;: int    </span>
+                        &nbsp;: string    </span>
 </dt>
 <dd></dd>
 
             <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Response.html#method_setBody">setBody()</a>
+    <a href="classes/Nitric-Faas-Response.html#method_setContext">setContext()</a>
     <span>
-                        &nbsp;: void    </span>
+                        &nbsp;: <a href="classes/Nitric-Faas-Response.html"><abbr title="\Nitric\Faas\Response">Response</abbr></a>    </span>
 </dt>
 <dd></dd>
 
             <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Response.html#method_setHeaders">setHeaders()</a>
+    <a href="classes/Nitric-Faas-Response.html#method_setData">setData()</a>
     <span>
-                        &nbsp;: void    </span>
+                        &nbsp;: <a href="classes/Nitric-Faas-Response.html"><abbr title="\Nitric\Faas\Response">Response</abbr></a>    </span>
 </dt>
 <dd></dd>
 
             <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Nitric-Faas-Response.html#method_setStatus">setStatus()</a>
+    <a href="classes/Nitric-Faas-Response.html#method_toTriggerResponse">toTriggerResponse()</a>
     <span>
-                        &nbsp;: void    </span>
+                        &nbsp;: <abbr title="\Nitric\Proto\Faas\V1\TriggerResponse">TriggerResponse</abbr>    </span>
 </dt>
 <dd></dd>
 
@@ -218,56 +199,24 @@ <h3 class="phpdocumentor-elements__header" id="properties">
             -private
                                                         "
 >
-    <h4 class="phpdocumentor-element__name" id="property_body">
-        $body
-        <a href="classes/Nitric-Faas-Response.html#property_body" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="property_context">
+        $context
+        <a href="classes/Nitric-Faas-Response.html#property_context" class="headerlink"><i class="fas fa-link"></i></a>
         <span class="phpdocumentor-element__modifiers">
                                 </span>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Response.php"><a href="files/nitric-faas-response.html"><abbr title="Nitric/Faas/Response.php">Response.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">28</span>
-</aside>
-
-    
-    <code class="phpdocumentor-code phpdocumentor-signature ">
-    <span class="phpdocumentor-signature__visibility">private</span>
-        <span class="phpdocumentor-signature__type">string</span>
-    <span class="phpdocumentor-signature__name">$body</span>
-    </code>
+    <span class="phpdocumentor-element-found-in__line">33</span>
 
-        <section class="phpdocumentor-description"></section>
-
-        <section class="phpdocumentor-description"></section>
-
-    
-
-</article>
-                    <article
-        class="
-            phpdocumentor-element
-            -property
-            -private
-                                                        "
->
-    <h4 class="phpdocumentor-element__name" id="property_headers">
-        $headers
-        <a href="classes/Nitric-Faas-Response.html#property_headers" class="headerlink"><i class="fas fa-link"></i></a>
-        <span class="phpdocumentor-element__modifiers">
-                                </span>
-    </h4>
-    <aside class="phpdocumentor-element-found-in">
-    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Response.php"><a href="files/nitric-faas-response.html"><abbr title="Nitric/Faas/Response.php">Response.php</abbr></a></abbr>
-    :
-    <span class="phpdocumentor-element-found-in__line">30</span>
-</aside>
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">private</span>
-        <span class="phpdocumentor-signature__type">array&lt;string|int, mixed&gt;</span>
-    <span class="phpdocumentor-signature__name">$headers</span>
+        <span class="phpdocumentor-signature__type"><a href="classes/Nitric-Faas-ResponseContext.html"><abbr title="\Nitric\Faas\ResponseContext">ResponseContext</abbr></a></span>
+    <span class="phpdocumentor-signature__name">$context</span>
     </code>
 
         <section class="phpdocumentor-description"></section>
@@ -284,23 +233,24 @@ <h4 class="phpdocumentor-element__name" id="property_headers">
             -private
                                                         "
 >
-    <h4 class="phpdocumentor-element__name" id="property_status">
-        $status
-        <a href="classes/Nitric-Faas-Response.html#property_status" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="property_data">
+        $data
+        <a href="classes/Nitric-Faas-Response.html#property_data" class="headerlink"><i class="fas fa-link"></i></a>
         <span class="phpdocumentor-element__modifiers">
                                 </span>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Response.php"><a href="files/nitric-faas-response.html"><abbr title="Nitric/Faas/Response.php">Response.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">29</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">34</span>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">private</span>
-        <span class="phpdocumentor-signature__type">int</span>
-    <span class="phpdocumentor-signature__name">$status</span>
+        <span class="phpdocumentor-signature__type">string</span>
+    <span class="phpdocumentor-signature__name">$data</span>
     </code>
 
         <section class="phpdocumentor-description"></section>
@@ -323,83 +273,28 @@ <h3 class="phpdocumentor-elements__header" id="methods">
             -public
                                                         "
 >
-    <h4 class="phpdocumentor-element__name" id="method___construct">
-        __construct()
-        <a href="classes/Nitric-Faas-Response.html#method___construct" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="method_getContext">
+        getContext()
+        <a href="classes/Nitric-Faas-Response.html#method_getContext" class="headerlink"><i class="fas fa-link"></i></a>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Response.php"><a href="files/nitric-faas-response.html"><abbr title="Nitric/Faas/Response.php">Response.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">90</span>
-</aside>
-
-        <p class="phpdocumentor-summary">Response constructor.</p>
+    <span class="phpdocumentor-element-found-in__line">57</span>
 
-    <code class="phpdocumentor-code phpdocumentor-signature ">
-    <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">__construct</span><span>(</span><span class="phpdocumentor-signature__argument"><span>[</span><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$body</span><span> = </span><span class="phpdocumentor-signature__argument__default-value">&quot;&quot;</span><span> ]</span></span><span class="phpdocumentor-signature__argument"><span>[</span><span>, </span><span class="phpdocumentor-signature__argument__return-type">int&nbsp;</span><span class="phpdocumentor-signature__argument__name">$status</span><span> = </span><span class="phpdocumentor-signature__argument__default-value">200</span><span> ]</span></span><span class="phpdocumentor-signature__argument"><span>[</span><span>, </span><span class="phpdocumentor-signature__argument__return-type">array&lt;string|int, mixed&gt;&nbsp;</span><span class="phpdocumentor-signature__argument__name">$headers</span><span> = </span><span class="phpdocumentor-signature__argument__default-value">[]</span><span> ]</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
-
-    
-        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
-    <dl class="phpdocumentor-argument-list">
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$body</span>
-                : <span class="phpdocumentor-signature__argument__return-type">string</span>
-                 = <span class="phpdocumentor-signature__argument__default-value">&quot;&quot;</span>            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                
-            </dd>
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$status</span>
-                : <span class="phpdocumentor-signature__argument__return-type">int</span>
-                 = <span class="phpdocumentor-signature__argument__default-value">200</span>            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                
-            </dd>
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$headers</span>
-                : <span class="phpdocumentor-signature__argument__return-type">array&lt;string|int, mixed&gt;</span>
-                 = <span class="phpdocumentor-signature__argument__default-value">[]</span>            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                
-            </dd>
-            </dl>
-
-    
-
-        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">mixed</span>
-            &mdash;
-        
-    
-</article>
-                    <article
-        class="phpdocumentor-element
-            -method
-            -public
-                                                        "
->
-    <h4 class="phpdocumentor-element__name" id="method_getBody">
-        getBody()
-        <a href="classes/Nitric-Faas-Response.html#method_getBody" class="headerlink"><i class="fas fa-link"></i></a>
-    </h4>
-    <aside class="phpdocumentor-element-found-in">
-    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Response.php"><a href="files/nitric-faas-response.html"><abbr title="Nitric/Faas/Response.php">Response.php</abbr></a></abbr>
-    :
-    <span class="phpdocumentor-element-found-in__line">35</span>
-</aside>
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">getBody</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">string</span></code>
+                <span class="phpdocumentor-signature__name">getContext</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Response.html"><abbr title="\Nitric\Faas\Response">Response</abbr></a></span></code>
 
     
     
     
 
         <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">string</span>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Response.html"><abbr title="\Nitric\Faas\Response">Response</abbr></a></span>
             &mdash;
         
     
@@ -410,58 +305,28 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
             -public
                                                         "
 >
-    <h4 class="phpdocumentor-element__name" id="method_getHeaders">
-        getHeaders()
-        <a href="classes/Nitric-Faas-Response.html#method_getHeaders" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="method_getData">
+        getData()
+        <a href="classes/Nitric-Faas-Response.html#method_getData" class="headerlink"><i class="fas fa-link"></i></a>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Response.php"><a href="files/nitric-faas-response.html"><abbr title="Nitric/Faas/Response.php">Response.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">70</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">65</span>
 
-    
-    <code class="phpdocumentor-code phpdocumentor-signature ">
-    <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">getHeaders</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">array&lt;string|int, string&gt;</span></code>
-
-    
-    
-    
-
-        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">array&lt;string|int, string&gt;</span>
-            &mdash;
-        
-    
-</article>
-                    <article
-        class="phpdocumentor-element
-            -method
-            -public
-                                                        "
->
-    <h4 class="phpdocumentor-element__name" id="method_getStatus">
-        getStatus()
-        <a href="classes/Nitric-Faas-Response.html#method_getStatus" class="headerlink"><i class="fas fa-link"></i></a>
-    </h4>
-    <aside class="phpdocumentor-element-found-in">
-    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Response.php"><a href="files/nitric-faas-response.html"><abbr title="Nitric/Faas/Response.php">Response.php</abbr></a></abbr>
-    :
-    <span class="phpdocumentor-element-found-in__line">54</span>
-</aside>
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">getStatus</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">int</span></code>
+                <span class="phpdocumentor-signature__name">getData</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">string</span></code>
 
     
     
     
 
         <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">int</span>
+    <span class="phpdocumentor-signature__response_type">string</span>
             &mdash;
         
     
@@ -472,37 +337,39 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
             -public
                                                         "
 >
-    <h4 class="phpdocumentor-element__name" id="method_setBody">
-        setBody()
-        <a href="classes/Nitric-Faas-Response.html#method_setBody" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="method_setContext">
+        setContext()
+        <a href="classes/Nitric-Faas-Response.html#method_setContext" class="headerlink"><i class="fas fa-link"></i></a>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Response.php"><a href="files/nitric-faas-response.html"><abbr title="Nitric/Faas/Response.php">Response.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">46</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">48</span>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">setBody</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$body</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">void</span></code>
+                <span class="phpdocumentor-signature__name">setContext</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><a href="classes/Nitric-Faas-ResponseContext.html"><abbr title="\Nitric\Faas\ResponseContext">ResponseContext</abbr></a>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$context</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Response.html"><abbr title="\Nitric\Faas\Response">Response</abbr></a></span></code>
 
     
         <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
     <dl class="phpdocumentor-argument-list">
                     <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$body</span>
-                : <span class="phpdocumentor-signature__argument__return-type">string</span>
+                <span class="phpdocumentor-signature__argument__name">$context</span>
+                : <span class="phpdocumentor-signature__argument__return-type"><a href="classes/Nitric-Faas-ResponseContext.html"><abbr title="\Nitric\Faas\ResponseContext">ResponseContext</abbr></a></span>
                             </dt>
             <dd class="phpdocumentor-argument-list__definition">
-                
+                    <section class="phpdocumentor-description"></section>
+
             </dd>
             </dl>
 
     
 
         <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">void</span>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Response.html"><abbr title="\Nitric\Faas\Response">Response</abbr></a></span>
             &mdash;
         
     
@@ -513,37 +380,39 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
             -public
                                                         "
 >
-    <h4 class="phpdocumentor-element__name" id="method_setHeaders">
-        setHeaders()
-        <a href="classes/Nitric-Faas-Response.html#method_setHeaders" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="method_setData">
+        setData()
+        <a href="classes/Nitric-Faas-Response.html#method_setData" class="headerlink"><i class="fas fa-link"></i></a>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Response.php"><a href="files/nitric-faas-response.html"><abbr title="Nitric/Faas/Response.php">Response.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">78</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">39</span>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">setHeaders</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type">array&lt;string|int, mixed&gt;&nbsp;</span><span class="phpdocumentor-signature__argument__name">$headers</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">void</span></code>
+                <span class="phpdocumentor-signature__name">setData</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$data</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Response.html"><abbr title="\Nitric\Faas\Response">Response</abbr></a></span></code>
 
     
         <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
     <dl class="phpdocumentor-argument-list">
                     <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$headers</span>
-                : <span class="phpdocumentor-signature__argument__return-type">array&lt;string|int, mixed&gt;</span>
+                <span class="phpdocumentor-signature__argument__name">$data</span>
+                : <span class="phpdocumentor-signature__argument__return-type">string</span>
                             </dt>
             <dd class="phpdocumentor-argument-list__definition">
-                
+                    <section class="phpdocumentor-description"></section>
+
             </dd>
             </dl>
 
     
 
         <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">void</span>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Response.html"><abbr title="\Nitric\Faas\Response">Response</abbr></a></span>
             &mdash;
         
     
@@ -554,43 +423,97 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
             -public
                                                         "
 >
-    <h4 class="phpdocumentor-element__name" id="method_setStatus">
-        setStatus()
-        <a href="classes/Nitric-Faas-Response.html#method_setStatus" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="method_toTriggerResponse">
+        toTriggerResponse()
+        <a href="classes/Nitric-Faas-Response.html#method_toTriggerResponse" class="headerlink"><i class="fas fa-link"></i></a>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Response.php"><a href="files/nitric-faas-response.html"><abbr title="Nitric/Faas/Response.php">Response.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">62</span>
-</aside>
+    <span class="phpdocumentor-element-found-in__line">73</span>
+
+    </aside>
 
     
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">setStatus</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type">int&nbsp;</span><span class="phpdocumentor-signature__argument__name">$status</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">void</span></code>
+                <span class="phpdocumentor-signature__name">toTriggerResponse</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><abbr title="\Nitric\Proto\Faas\V1\TriggerResponse">TriggerResponse</abbr></span></code>
 
-    
-        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
-    <dl class="phpdocumentor-argument-list">
-                    <dt class="phpdocumentor-argument-list__entry">
-                <span class="phpdocumentor-signature__argument__name">$status</span>
-                : <span class="phpdocumentor-signature__argument__return-type">int</span>
-                            </dt>
-            <dd class="phpdocumentor-argument-list__definition">
-                
-            </dd>
-            </dl>
+        <section class="phpdocumentor-description"></section>
 
     
+    
 
         <h5 class="phpdocumentor-return-value__heading">Return values</h5>
-    <span class="phpdocumentor-signature__response_type">void</span>
+    <span class="phpdocumentor-signature__response_type"><abbr title="\Nitric\Proto\Faas\V1\TriggerResponse">TriggerResponse</abbr></span>
             &mdash;
         
     
 </article>
             </section>
 
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -615,5 +538,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Faas-ResponseContext.html b/docs/classes/Nitric-Faas-ResponseContext.html
new file mode 100644
index 0000000..991c2ea
--- /dev/null
+++ b/docs/classes/Nitric-Faas-ResponseContext.html
@@ -0,0 +1,469 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Documentation</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <base href="../">
+    <link rel="icon" href="images/favicon.ico"/>
+    <link rel="stylesheet" href="css/normalize.css">
+    <link rel="stylesheet" href="css/base.css">
+            <link rel="preconnect" href="https://fonts.gstatic.com">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link rel="stylesheet" href="css/template.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
+                <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
+        <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
+        <script src="js/search.js"></script>
+        <script defer src="js/searchIndex.js"></script>
+    </head>
+<body id="top">
+    <header class="phpdocumentor-header phpdocumentor-section">
+    <h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Documentation</a></h1>
+    <input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
+    <label class="phpdocumentor-header__menu-icon" for="menu-button">
+        <i class="fas fa-bars"></i>
+    </label>
+    <section data-search-form class="phpdocumentor-search">
+    <label>
+        <span class="visually-hidden">Search for</span>
+        <svg class="phpdocumentor-search__icon" width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <circle cx="7.5" cy="7.5" r="6.5" stroke="currentColor" stroke-width="2"/>
+            <line x1="12.4892" y1="12.2727" x2="19.1559" y2="18.9393" stroke="currentColor" stroke-width="3"/>
+        </svg>
+        <input type="search" class="phpdocumentor-field phpdocumentor-search__field" placeholder="Loading .." disabled />
+    </label>
+</section>
+
+    <nav class="phpdocumentor-topnav">
+    <ul class="phpdocumentor-topnav__menu">
+        </ul>
+</nav>
+</header>
+
+    <main class="phpdocumentor">
+        <div class="phpdocumentor-section">
+            <input class="phpdocumentor-sidebar__menu-button" type="checkbox" id="sidebar-button" name="sidebar-button" />
+<label class="phpdocumentor-sidebar__menu-icon" for="sidebar-button">
+    Menu
+</label>
+<aside class="phpdocumentor-column -four phpdocumentor-sidebar">
+        
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Namespaces</h2>
+                                                <h4 class="phpdocumentor-sidebar__root-namespace"><a href="namespaces/nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h4>
+                <ul class="phpdocumentor-list">
+                                            <li><a href="namespaces/nitric-api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                            <li><a href="namespaces/nitric-faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                                    </ul>
+                        </section>
+
+        <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Packages</h2>
+                    <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Default.html"><abbr title="\Default">Default</abbr></a></h3>
+                                <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h3>
+                        <ul class="phpdocumentor-list">
+                                    <li><a href="packages/Nitric-Api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                    <li><a href="packages/Nitric-Faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                            </ul>
+                        </section>
+    
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Reports</h2>
+                <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/deprecated.html">Deprecated</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/errors.html">Errors</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/markers.html">Markers</a></h3>
+    </section>
+
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Indices</h2>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="indices/files.html">Files</a></h3>
+    </section>
+</aside>
+
+            <div class="phpdocumentor-column -eight phpdocumentor-content">
+                    <ul class="phpdocumentor-breadcrumbs">
+            <li class="phpdocumentor-breadcrumb"><a href="namespaces/nitric.html">Nitric</a></li>
+            <li class="phpdocumentor-breadcrumb"><a href="namespaces/nitric-faas.html">Faas</a></li>
+    </ul>
+
+    <article class="phpdocumentor-element -class">
+        <h2 class="phpdocumentor-content__title">
+    ResponseContext
+
+    
+            <div class="phpdocumentor-element__package">
+            in package
+            <ul class="phpdocumentor-breadcrumbs">
+                                    <li class="phpdocumentor-breadcrumb"><a href="packages/Default.html">Default</a></li>
+                            </ul>
+        </div>
+    
+    
+    </h2>
+
+        <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">21</span>
+
+    </aside>
+
+        
+    <section class="phpdocumentor-description"></section>
+
+
+
+
+
+
+
+
+<h3 id="toc">
+    Table of Contents
+    <a href="#toc" class="headerlink"><i class="fas fa-link"></i></a>
+</h3>
+
+<dl class="phpdocumentor-table-of-contents">
+                    <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_asHttp">asHttp()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_asTopic">asTopic()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_http">http()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_isHttp">isHttp()</a>
+    <span>
+                        &nbsp;: bool    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_isTopic">isTopic()</a>
+    <span>
+                        &nbsp;: bool    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_topic">topic()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+        </dl>
+
+
+
+        
+
+        
+
+            <section class="phpdocumentor-methods">
+        <h3 class="phpdocumentor-elements__header" id="methods">
+            Methods
+            <a href="classes/Nitric-Faas-ResponseContext.html#methods" class="headerlink"><i class="fas fa-link"></i></a>
+        </h3>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_asHttp">
+        asHttp()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_asHttp" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">43</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">asHttp</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_asTopic">
+        asTopic()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_asTopic" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">53</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">asTopic</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                    -static                    "
+>
+    <h4 class="phpdocumentor-element__name" id="method_http">
+        http()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_http" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">63</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">http</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_isHttp">
+        isHttp()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_isHttp" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">27</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">isHttp</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">bool</span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">bool</span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_isTopic">
+        isTopic()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_isTopic" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">35</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">isTopic</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">bool</span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">bool</span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                    -static                    "
+>
+    <h4 class="phpdocumentor-element__name" id="method_topic">
+        topic()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_topic" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">71</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">topic</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+            </section>
+
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
+    </article>
+                <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
+    <section class="phpdocumentor-search-results__dialog">
+        <header class="phpdocumentor-search-results__header">
+            <h2 class="phpdocumentor-search-results__title">Search results</h2>
+            <button class="phpdocumentor-search-results__close"><i class="fas fa-times"></i></button>
+        </header>
+        <section class="phpdocumentor-search-results__body">
+            <ul class="phpdocumentor-search-results__entries"></ul>
+        </section>
+    </section>
+</section>
+            </div>
+        </div>
+        <a href="classes/Nitric-Faas-ResponseContext.html#top" class="phpdocumentor-back-to-top"><i class="fas fa-chevron-circle-up"></i></a>
+
+    </main>
+
+    <script>
+        cssVars({});
+    </script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
+</body>
+</html>
diff --git a/docs/classes/Nitric-Faas-SourceType.html b/docs/classes/Nitric-Faas-SourceType.html
index 4c566c9..266c7e1 100644
--- a/docs/classes/Nitric-Faas-SourceType.html
+++ b/docs/classes/Nitric-Faas-SourceType.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -110,7 +111,8 @@ <h2 class="phpdocumentor-content__title">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/SourceType.php"><a href="files/nitric-faas-sourcetype.html"><abbr title="Nitric/Faas/SourceType.php">SourceType.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">25</span>
-</aside>
+
+    </aside>
 
             <p class="phpdocumentor-summary">Class SourceType represents the source type of a request such as HTTP Requests and Subscription Events.</p>
 
@@ -177,7 +179,8 @@ <h4 class="phpdocumentor-element__name" id="constant_REQUEST">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/SourceType.php"><a href="files/nitric-faas-sourcetype.html"><abbr title="Nitric/Faas/SourceType.php">SourceType.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">30</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">HTTP Request source type</p>
 
@@ -205,7 +208,8 @@ <h4 class="phpdocumentor-element__name" id="constant_SUBSCRIPTION">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/SourceType.php"><a href="files/nitric-faas-sourcetype.html"><abbr title="Nitric/Faas/SourceType.php">SourceType.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">34</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Event source type</p>
 
@@ -233,7 +237,8 @@ <h4 class="phpdocumentor-element__name" id="constant_UNKNOWN">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/SourceType.php"><a href="files/nitric-faas-sourcetype.html"><abbr title="Nitric/Faas/SourceType.php">SourceType.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">38</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Unknown source type</p>
 
@@ -274,7 +279,8 @@ <h4 class="phpdocumentor-element__name" id="method_fromString">
     <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/SourceType.php"><a href="files/nitric-faas-sourcetype.html"><abbr title="Nitric/Faas/SourceType.php">SourceType.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">46</span>
-</aside>
+
+    </aside>
 
         <p class="phpdocumentor-summary">Parse a SourceType from a string representation. Supported values are:
 REQUEST &amp; SUBSCRIPTION, all other values will return UNKNOWN.</p>
@@ -305,6 +311,68 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
 </article>
             </section>
 
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
     </article>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -329,5 +397,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/classes/Nitric-Faas-TopicContext.html b/docs/classes/Nitric-Faas-TopicContext.html
new file mode 100644
index 0000000..c5c16c9
--- /dev/null
+++ b/docs/classes/Nitric-Faas-TopicContext.html
@@ -0,0 +1,682 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Documentation</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <base href="../">
+    <link rel="icon" href="images/favicon.ico"/>
+    <link rel="stylesheet" href="css/normalize.css">
+    <link rel="stylesheet" href="css/base.css">
+            <link rel="preconnect" href="https://fonts.gstatic.com">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link rel="stylesheet" href="css/template.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
+                <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
+        <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
+        <script src="js/search.js"></script>
+        <script defer src="js/searchIndex.js"></script>
+    </head>
+<body id="top">
+    <header class="phpdocumentor-header phpdocumentor-section">
+    <h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Documentation</a></h1>
+    <input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
+    <label class="phpdocumentor-header__menu-icon" for="menu-button">
+        <i class="fas fa-bars"></i>
+    </label>
+    <section data-search-form class="phpdocumentor-search">
+    <label>
+        <span class="visually-hidden">Search for</span>
+        <svg class="phpdocumentor-search__icon" width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <circle cx="7.5" cy="7.5" r="6.5" stroke="currentColor" stroke-width="2"/>
+            <line x1="12.4892" y1="12.2727" x2="19.1559" y2="18.9393" stroke="currentColor" stroke-width="3"/>
+        </svg>
+        <input type="search" class="phpdocumentor-field phpdocumentor-search__field" placeholder="Loading .." disabled />
+    </label>
+</section>
+
+    <nav class="phpdocumentor-topnav">
+    <ul class="phpdocumentor-topnav__menu">
+        </ul>
+</nav>
+</header>
+
+    <main class="phpdocumentor">
+        <div class="phpdocumentor-section">
+            <input class="phpdocumentor-sidebar__menu-button" type="checkbox" id="sidebar-button" name="sidebar-button" />
+<label class="phpdocumentor-sidebar__menu-icon" for="sidebar-button">
+    Menu
+</label>
+<aside class="phpdocumentor-column -four phpdocumentor-sidebar">
+        
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Namespaces</h2>
+                                                <h4 class="phpdocumentor-sidebar__root-namespace"><a href="namespaces/nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h4>
+                <ul class="phpdocumentor-list">
+                                            <li><a href="namespaces/nitric-api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                            <li><a href="namespaces/nitric-faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                                    </ul>
+                        </section>
+
+        <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Packages</h2>
+                    <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Default.html"><abbr title="\Default">Default</abbr></a></h3>
+                                <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h3>
+                        <ul class="phpdocumentor-list">
+                                    <li><a href="packages/Nitric-Api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                    <li><a href="packages/Nitric-Faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                            </ul>
+                        </section>
+    
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Reports</h2>
+                <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/deprecated.html">Deprecated</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/errors.html">Errors</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/markers.html">Markers</a></h3>
+    </section>
+
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Indices</h2>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="indices/files.html">Files</a></h3>
+    </section>
+</aside>
+
+            <div class="phpdocumentor-column -eight phpdocumentor-content">
+                    <ul class="phpdocumentor-breadcrumbs">
+            <li class="phpdocumentor-breadcrumb"><a href="namespaces/nitric.html">Nitric</a></li>
+            <li class="phpdocumentor-breadcrumb"><a href="namespaces/nitric-faas.html">Faas</a></li>
+    </ul>
+
+    <article class="phpdocumentor-element -class">
+        <h2 class="phpdocumentor-content__title">
+    TopicContext
+
+        <span class="phpdocumentor-element__extends">
+        extends <a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a>
+    </span>
+    
+            <div class="phpdocumentor-element__package">
+            in package
+            <ul class="phpdocumentor-breadcrumbs">
+                                    <li class="phpdocumentor-breadcrumb"><a href="packages/Default.html">Default</a></li>
+                            </ul>
+        </div>
+    
+    
+    </h2>
+
+        <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/TopicContext.php"><a href="files/nitric-faas-topiccontext.html"><abbr title="Nitric/Faas/TopicContext.php">TopicContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">23</span>
+
+    </aside>
+
+            <p class="phpdocumentor-summary">Class Context represents the metadata of a FaaS request</p>
+
+
+
+
+
+
+
+
+
+<h3 id="toc">
+    Table of Contents
+    <a href="#toc" class="headerlink"><i class="fas fa-link"></i></a>
+</h3>
+
+<dl class="phpdocumentor-table-of-contents">
+                <dt class="phpdocumentor-table-of-contents__entry -property -private">
+    <a href="classes/Nitric-Faas-TopicContext.html#property_topic">$topic</a>
+    <span>
+                &nbsp;: string            </span>
+</dt>
+<dd></dd>
+
+                <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-TopicContext.html#method___construct">__construct()</a>
+    <span>
+                        &nbsp;: mixed    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-Context.html#method_asHttpContext">asHttpContext()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-Context.html#method_asTopicContext">asTopicContext()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-Context.html#method_fromHttpTriggerContext">fromHttpTriggerContext()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-Context.html#method_fromTopicTriggerContext">fromTopicTriggerContext()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-Context.html#method_fromTriggerRequest">fromTriggerRequest()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-TopicContext.html#method_getTopic">getTopic()</a>
+    <span>
+                        &nbsp;: mixed    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-Context.html#method_isHttp">isHttp()</a>
+    <span>
+                        &nbsp;: bool    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-Context.html#method_isTopic">isTopic()</a>
+    <span>
+                        &nbsp;: bool    </span>
+</dt>
+<dd></dd>
+
+        </dl>
+
+
+
+        
+
+        
+    <section class="phpdocumentor-properties">
+        <h3 class="phpdocumentor-elements__header" id="properties">
+            Properties
+            <a href="classes/Nitric-Faas-TopicContext.html#properties" class="headerlink"><i class="fas fa-link"></i></a>
+        </h3>
+                    <article
+        class="
+            phpdocumentor-element
+            -property
+            -private
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="property_topic">
+        $topic
+        <a href="classes/Nitric-Faas-TopicContext.html#property_topic" class="headerlink"><i class="fas fa-link"></i></a>
+        <span class="phpdocumentor-element__modifiers">
+                                </span>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/TopicContext.php"><a href="files/nitric-faas-topiccontext.html"><abbr title="Nitric/Faas/TopicContext.php">TopicContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">25</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">private</span>
+        <span class="phpdocumentor-signature__type">string</span>
+    <span class="phpdocumentor-signature__name">$topic</span>
+    </code>
+
+        <section class="phpdocumentor-description"></section>
+
+        <section class="phpdocumentor-description"></section>
+
+    
+
+</article>
+            </section>
+
+            <section class="phpdocumentor-methods">
+        <h3 class="phpdocumentor-elements__header" id="methods">
+            Methods
+            <a href="classes/Nitric-Faas-TopicContext.html#methods" class="headerlink"><i class="fas fa-link"></i></a>
+        </h3>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method___construct">
+        __construct()
+        <a href="classes/Nitric-Faas-TopicContext.html#method___construct" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/TopicContext.php"><a href="files/nitric-faas-topiccontext.html"><abbr title="Nitric/Faas/TopicContext.php">TopicContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">27</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">__construct</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$topic</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
+
+        <section class="phpdocumentor-description"></section>
+
+        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
+    <dl class="phpdocumentor-argument-list">
+                    <dt class="phpdocumentor-argument-list__entry">
+                <span class="phpdocumentor-signature__argument__name">$topic</span>
+                : <span class="phpdocumentor-signature__argument__return-type">string</span>
+                            </dt>
+            <dd class="phpdocumentor-argument-list__definition">
+                    <section class="phpdocumentor-description"></section>
+
+            </dd>
+            </dl>
+
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">mixed</span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_asHttpContext">
+        asHttpContext()
+        <a href="classes/Nitric-Faas-Context.html#method_asHttpContext" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">62</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">asHttpContext</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_asTopicContext">
+        asTopicContext()
+        <a href="classes/Nitric-Faas-Context.html#method_asTopicContext" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">51</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">asTopicContext</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                    -static                    "
+>
+    <h4 class="phpdocumentor-element__name" id="method_fromHttpTriggerContext">
+        fromHttpTriggerContext()
+        <a href="classes/Nitric-Faas-Context.html#method_fromHttpTriggerContext" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">74</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">fromHttpTriggerContext</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\HttpTriggerContext">HttpTriggerContext</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$context</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a></span></code>
+
+    
+        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
+    <dl class="phpdocumentor-argument-list">
+                    <dt class="phpdocumentor-argument-list__entry">
+                <span class="phpdocumentor-signature__argument__name">$context</span>
+                : <span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\HttpTriggerContext">HttpTriggerContext</abbr></span>
+                            </dt>
+            <dd class="phpdocumentor-argument-list__definition">
+                    <section class="phpdocumentor-description"></section>
+
+            </dd>
+            </dl>
+
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                    -static                    "
+>
+    <h4 class="phpdocumentor-element__name" id="method_fromTopicTriggerContext">
+        fromTopicTriggerContext()
+        <a href="classes/Nitric-Faas-Context.html#method_fromTopicTriggerContext" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">87</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">fromTopicTriggerContext</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\TopicTriggerContext">TopicTriggerContext</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$context</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a></span></code>
+
+    
+        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
+    <dl class="phpdocumentor-argument-list">
+                    <dt class="phpdocumentor-argument-list__entry">
+                <span class="phpdocumentor-signature__argument__name">$context</span>
+                : <span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\TopicTriggerContext">TopicTriggerContext</abbr></span>
+                            </dt>
+            <dd class="phpdocumentor-argument-list__definition">
+                    <section class="phpdocumentor-description"></section>
+
+            </dd>
+            </dl>
+
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                    -static                    "
+>
+    <h4 class="phpdocumentor-element__name" id="method_fromTriggerRequest">
+        fromTriggerRequest()
+        <a href="classes/Nitric-Faas-Context.html#method_fromTriggerRequest" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">97</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">fromTriggerRequest</span><span>(</span><span class="phpdocumentor-signature__argument"><span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\TriggerRequest">TriggerRequest</abbr>&nbsp;</span><span class="phpdocumentor-signature__argument__name">$request</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a></span></code>
+
+    
+        <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
+    <dl class="phpdocumentor-argument-list">
+                    <dt class="phpdocumentor-argument-list__entry">
+                <span class="phpdocumentor-signature__argument__name">$request</span>
+                : <span class="phpdocumentor-signature__argument__return-type"><abbr title="\Nitric\Proto\Faas\V1\TriggerRequest">TriggerRequest</abbr></span>
+                            </dt>
+            <dd class="phpdocumentor-argument-list__definition">
+                    <section class="phpdocumentor-description"></section>
+
+            </dd>
+            </dl>
+
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_getTopic">
+        getTopic()
+        <a href="classes/Nitric-Faas-TopicContext.html#method_getTopic" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/TopicContext.php"><a href="files/nitric-faas-topiccontext.html"><abbr title="Nitric/Faas/TopicContext.php">TopicContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">33</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">getTopic</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
+
+        <section class="phpdocumentor-description"></section>
+
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">mixed</span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_isHttp">
+        isHttp()
+        <a href="classes/Nitric-Faas-Context.html#method_isHttp" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">43</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">isHttp</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">bool</span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">bool</span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_isTopic">
+        isTopic()
+        <a href="classes/Nitric-Faas-Context.html#method_isTopic" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/Context.php"><a href="files/nitric-faas-context.html"><abbr title="Nitric/Faas/Context.php">Context.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">35</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">isTopic</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">bool</span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">bool</span>
+            &mdash;
+        
+    
+</article>
+            </section>
+
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
+    </article>
+                <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
+    <section class="phpdocumentor-search-results__dialog">
+        <header class="phpdocumentor-search-results__header">
+            <h2 class="phpdocumentor-search-results__title">Search results</h2>
+            <button class="phpdocumentor-search-results__close"><i class="fas fa-times"></i></button>
+        </header>
+        <section class="phpdocumentor-search-results__body">
+            <ul class="phpdocumentor-search-results__entries"></ul>
+        </section>
+    </section>
+</section>
+            </div>
+        </div>
+        <a href="classes/Nitric-Faas-TopicContext.html#top" class="phpdocumentor-back-to-top"><i class="fas fa-chevron-circle-up"></i></a>
+
+    </main>
+
+    <script>
+        cssVars({});
+    </script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
+</body>
+</html>
diff --git a/docs/classes/Nitric-Faas-TopicResponseContext.html b/docs/classes/Nitric-Faas-TopicResponseContext.html
new file mode 100644
index 0000000..3e2a0db
--- /dev/null
+++ b/docs/classes/Nitric-Faas-TopicResponseContext.html
@@ -0,0 +1,598 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Documentation</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <base href="../">
+    <link rel="icon" href="images/favicon.ico"/>
+    <link rel="stylesheet" href="css/normalize.css">
+    <link rel="stylesheet" href="css/base.css">
+            <link rel="preconnect" href="https://fonts.gstatic.com">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link rel="stylesheet" href="css/template.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
+                <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
+        <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
+        <script src="js/search.js"></script>
+        <script defer src="js/searchIndex.js"></script>
+    </head>
+<body id="top">
+    <header class="phpdocumentor-header phpdocumentor-section">
+    <h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Documentation</a></h1>
+    <input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
+    <label class="phpdocumentor-header__menu-icon" for="menu-button">
+        <i class="fas fa-bars"></i>
+    </label>
+    <section data-search-form class="phpdocumentor-search">
+    <label>
+        <span class="visually-hidden">Search for</span>
+        <svg class="phpdocumentor-search__icon" width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <circle cx="7.5" cy="7.5" r="6.5" stroke="currentColor" stroke-width="2"/>
+            <line x1="12.4892" y1="12.2727" x2="19.1559" y2="18.9393" stroke="currentColor" stroke-width="3"/>
+        </svg>
+        <input type="search" class="phpdocumentor-field phpdocumentor-search__field" placeholder="Loading .." disabled />
+    </label>
+</section>
+
+    <nav class="phpdocumentor-topnav">
+    <ul class="phpdocumentor-topnav__menu">
+        </ul>
+</nav>
+</header>
+
+    <main class="phpdocumentor">
+        <div class="phpdocumentor-section">
+            <input class="phpdocumentor-sidebar__menu-button" type="checkbox" id="sidebar-button" name="sidebar-button" />
+<label class="phpdocumentor-sidebar__menu-icon" for="sidebar-button">
+    Menu
+</label>
+<aside class="phpdocumentor-column -four phpdocumentor-sidebar">
+        
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Namespaces</h2>
+                                                <h4 class="phpdocumentor-sidebar__root-namespace"><a href="namespaces/nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h4>
+                <ul class="phpdocumentor-list">
+                                            <li><a href="namespaces/nitric-api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                            <li><a href="namespaces/nitric-faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                                    </ul>
+                        </section>
+
+        <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Packages</h2>
+                    <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Default.html"><abbr title="\Default">Default</abbr></a></h3>
+                                <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h3>
+                        <ul class="phpdocumentor-list">
+                                    <li><a href="packages/Nitric-Api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                    <li><a href="packages/Nitric-Faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                            </ul>
+                        </section>
+    
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Reports</h2>
+                <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/deprecated.html">Deprecated</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/errors.html">Errors</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/markers.html">Markers</a></h3>
+    </section>
+
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Indices</h2>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="indices/files.html">Files</a></h3>
+    </section>
+</aside>
+
+            <div class="phpdocumentor-column -eight phpdocumentor-content">
+                    <ul class="phpdocumentor-breadcrumbs">
+            <li class="phpdocumentor-breadcrumb"><a href="namespaces/nitric.html">Nitric</a></li>
+            <li class="phpdocumentor-breadcrumb"><a href="namespaces/nitric-faas.html">Faas</a></li>
+    </ul>
+
+    <article class="phpdocumentor-element -class">
+        <h2 class="phpdocumentor-content__title">
+    TopicResponseContext
+
+        <span class="phpdocumentor-element__extends">
+        extends <a href="classes/Nitric-Faas-ResponseContext.html"><abbr title="\Nitric\Faas\ResponseContext">ResponseContext</abbr></a>
+    </span>
+    
+            <div class="phpdocumentor-element__package">
+            in package
+            <ul class="phpdocumentor-breadcrumbs">
+                                    <li class="phpdocumentor-breadcrumb"><a href="packages/Default.html">Default</a></li>
+                            </ul>
+        </div>
+    
+    
+    </h2>
+
+        <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/TopicResponseContext.php"><a href="files/nitric-faas-topicresponsecontext.html"><abbr title="Nitric/Faas/TopicResponseContext.php">TopicResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">24</span>
+
+    </aside>
+
+        
+    <section class="phpdocumentor-description"></section>
+
+
+
+
+
+
+
+
+<h3 id="toc">
+    Table of Contents
+    <a href="#toc" class="headerlink"><i class="fas fa-link"></i></a>
+</h3>
+
+<dl class="phpdocumentor-table-of-contents">
+                <dt class="phpdocumentor-table-of-contents__entry -property -public">
+    <a href="classes/Nitric-Faas-TopicResponseContext.html#property_success">$success</a>
+    <span>
+                &nbsp;: mixed            </span>
+</dt>
+<dd></dd>
+
+                <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-TopicResponseContext.html#method___construct">__construct()</a>
+    <span>
+                        &nbsp;: mixed    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_asHttp">asHttp()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_asTopic">asTopic()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_http">http()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_isHttp">isHttp()</a>
+    <span>
+                        &nbsp;: bool    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_isTopic">isTopic()</a>
+    <span>
+                        &nbsp;: bool    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-TopicResponseContext.html#method_toGrpcResponseContext">toGrpcResponseContext()</a>
+    <span>
+                        &nbsp;: <abbr title="\Nitric\Faas\Nitric\Proto\Faas\V1\TopicResponseContext">TopicResponseContext</abbr>    </span>
+</dt>
+<dd></dd>
+
+            <dt class="phpdocumentor-table-of-contents__entry -method -public">
+    <a href="classes/Nitric-Faas-ResponseContext.html#method_topic">topic()</a>
+    <span>
+                        &nbsp;: <a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a>    </span>
+</dt>
+<dd></dd>
+
+        </dl>
+
+
+
+        
+
+        
+    <section class="phpdocumentor-properties">
+        <h3 class="phpdocumentor-elements__header" id="properties">
+            Properties
+            <a href="classes/Nitric-Faas-TopicResponseContext.html#properties" class="headerlink"><i class="fas fa-link"></i></a>
+        </h3>
+                    <article
+        class="
+            phpdocumentor-element
+            -property
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="property_success">
+        $success
+        <a href="classes/Nitric-Faas-TopicResponseContext.html#property_success" class="headerlink"><i class="fas fa-link"></i></a>
+        <span class="phpdocumentor-element__modifiers">
+                                </span>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/TopicResponseContext.php"><a href="files/nitric-faas-topicresponsecontext.html"><abbr title="Nitric/Faas/TopicResponseContext.php">TopicResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">26</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+        <span class="phpdocumentor-signature__type">mixed</span>
+    <span class="phpdocumentor-signature__name">$success</span>
+     = <span class="phpdocumentor-signature__default-value">true</span></code>
+
+        <section class="phpdocumentor-description"></section>
+
+        <section class="phpdocumentor-description"></section>
+
+    
+
+</article>
+            </section>
+
+            <section class="phpdocumentor-methods">
+        <h3 class="phpdocumentor-elements__header" id="methods">
+            Methods
+            <a href="classes/Nitric-Faas-TopicResponseContext.html#methods" class="headerlink"><i class="fas fa-link"></i></a>
+        </h3>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method___construct">
+        __construct()
+        <a href="classes/Nitric-Faas-TopicResponseContext.html#method___construct" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/TopicResponseContext.php"><a href="files/nitric-faas-topicresponsecontext.html"><abbr title="Nitric/Faas/TopicResponseContext.php">TopicResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">28</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">__construct</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">mixed</span></code>
+
+        <section class="phpdocumentor-description"></section>
+
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">mixed</span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_asHttp">
+        asHttp()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_asHttp" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">43</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">asHttp</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_asTopic">
+        asTopic()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_asTopic" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">53</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">asTopic</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                    -static                    "
+>
+    <h4 class="phpdocumentor-element__name" id="method_http">
+        http()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_http" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">63</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">http</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_isHttp">
+        isHttp()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_isHttp" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">27</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">isHttp</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">bool</span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">bool</span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_isTopic">
+        isTopic()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_isTopic" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">35</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">isTopic</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">bool</span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type">bool</span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                                        "
+>
+    <h4 class="phpdocumentor-element__name" id="method_toGrpcResponseContext">
+        toGrpcResponseContext()
+        <a href="classes/Nitric-Faas-TopicResponseContext.html#method_toGrpcResponseContext" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/TopicResponseContext.php"><a href="files/nitric-faas-topicresponsecontext.html"><abbr title="Nitric/Faas/TopicResponseContext.php">TopicResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">35</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+                <span class="phpdocumentor-signature__name">toGrpcResponseContext</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><abbr title="\Nitric\Faas\Nitric\Proto\Faas\V1\TopicResponseContext">TopicResponseContext</abbr></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><abbr title="\Nitric\Faas\Nitric\Proto\Faas\V1\TopicResponseContext">TopicResponseContext</abbr></span>
+            &mdash;
+        
+    
+</article>
+                    <article
+        class="phpdocumentor-element
+            -method
+            -public
+                                    -static                    "
+>
+    <h4 class="phpdocumentor-element__name" id="method_topic">
+        topic()
+        <a href="classes/Nitric-Faas-ResponseContext.html#method_topic" class="headerlink"><i class="fas fa-link"></i></a>
+    </h4>
+    <aside class="phpdocumentor-element-found-in">
+    <abbr class="phpdocumentor-element-found-in__file" title="Nitric/Faas/ResponseContext.php"><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></abbr>
+    :
+    <span class="phpdocumentor-element-found-in__line">71</span>
+
+    </aside>
+
+    
+    <code class="phpdocumentor-code phpdocumentor-signature ">
+    <span class="phpdocumentor-signature__visibility">public</span>
+            <span class="phpdocumentor-signature__static">static</span>    <span class="phpdocumentor-signature__name">topic</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a></span></code>
+
+    
+    
+    
+
+        <h5 class="phpdocumentor-return-value__heading">Return values</h5>
+    <span class="phpdocumentor-signature__response_type"><a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a></span>
+            &mdash;
+        
+    
+</article>
+            </section>
+
+        
+    <script type="text/javascript">
+        function loadExternalCodeSnippets(line) {
+            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach((pre) => {
+                var src = pre.getAttribute('data-src').replace( /\\/g, '/');
+                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+                var language = 'php';
+
+                var code = document.createElement('code');
+                code.className = 'language-' + language;
+
+                pre.textContent = '';
+
+                pre.setAttribute('data-line', line)
+                code.textContent = 'Loading…';
+
+                pre.appendChild(code);
+
+                var xhr = new XMLHttpRequest();
+
+                xhr.open('GET', src, true);
+
+                xhr.onreadystatechange = function () {
+                    if (xhr.readyState == 4) {
+
+                        if (xhr.status < 400 && xhr.responseText) {
+                            code.textContent = xhr.responseText;
+
+                            Prism.highlightElement(code);
+                        }
+                        else if (xhr.status >= 400) {
+                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+                        }
+                        else {
+                            code.textContent = '✖ Error: File does not exist, is empty or trying to view from localhost';
+                        }
+                    }
+                };
+
+                xhr.send(null);
+            });
+        }
+
+        var modals = document.querySelectorAll("[data-modal]");
+
+        modals.forEach(function (trigger) {
+            trigger.addEventListener("click", function (event) {
+                //event.preventDefault();
+                const modal = document.getElementById(trigger.dataset.modal);
+                modal.classList.add("phpdocumentor-modal__open");
+                loadExternalCodeSnippets(trigger.dataset.line)
+                const exits = modal.querySelectorAll("[data-exit-button]");
+                exits.forEach(function (exit) {
+                    exit.addEventListener("click", function (event) {
+                        event.preventDefault();
+                        modal.classList.remove("phpdocumentor-modal__open");
+                    });
+                });
+            });
+        });
+    </script>
+
+    </article>
+                <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
+    <section class="phpdocumentor-search-results__dialog">
+        <header class="phpdocumentor-search-results__header">
+            <h2 class="phpdocumentor-search-results__title">Search results</h2>
+            <button class="phpdocumentor-search-results__close"><i class="fas fa-times"></i></button>
+        </header>
+        <section class="phpdocumentor-search-results__body">
+            <ul class="phpdocumentor-search-results__entries"></ul>
+        </section>
+    </section>
+</section>
+            </div>
+        </div>
+        <a href="classes/Nitric-Faas-TopicResponseContext.html#top" class="phpdocumentor-back-to-top"><i class="fas fa-chevron-circle-up"></i></a>
+
+    </main>
+
+    <script>
+        cssVars({});
+    </script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
+</body>
+</html>
diff --git a/docs/css/base.css b/docs/css/base.css
index 082448f..db4e807 100644
--- a/docs/css/base.css
+++ b/docs/css/base.css
@@ -1025,6 +1025,53 @@ td.phpdocumentor-cell:last-child {
         border-radius: 3px;
     }
 }
+.phpdocumentor-modal {
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    opacity: 0;
+    visibility: hidden;
+    transition: all 0.3s ease;
+    top: 0;
+    left: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.phpdocumentor-modal__open {
+    visibility: visible;
+    opacity: 1;
+    transition-delay: 0s;
+}
+
+.phpdocumentor-modal-bg {
+    position: absolute;
+    background: gray;
+    opacity: 50%;
+    width: 100%;
+    height: 100%;
+}
+
+.phpdocumentor-modal-container {
+    border-radius: 1em;
+    background: #fff;
+    position: relative;
+    padding: 2em;
+}
+
+.phpdocumentor-modal__close {
+    position: absolute;
+    right: 0.75em;
+    top: 0.75em;
+    outline: none;
+    appearance: none;
+    color: var(--primary-color);
+    background: none;
+    border: 0px;
+    font-weight: bold;
+    cursor: pointer;
+}
 
 /* Used for screen readers and such */
 .visually-hidden {
diff --git a/docs/css/template.css b/docs/css/template.css
index fb905f3..31f00e3 100644
--- a/docs/css/template.css
+++ b/docs/css/template.css
@@ -153,6 +153,25 @@
     font-size: var(--text-sm);
     color: gray;
 }
+
+.phpdocumentor-element-found-in .phpdocumentor-element-found-in__source {
+    flex: 0 1 auto;
+    display: inline-flex;
+}
+
+.phpdocumentor-element-found-in .phpdocumentor-element-found-in__source:after {
+    width: 1.25rem;
+    height: 1.25rem;
+    line-height: 1.25rem;
+    background: transparent url('data:image/svg+xml;utf8,<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="gray"><path d="M5.854 4.854a.5.5 0 1 0-.708-.708l-3.5 3.5a.5.5 0 0 0 0 .708l3.5 3.5a.5.5 0 0 0 .708-.708L2.707 8l3.147-3.146zm4.292 0a.5.5 0 0 1 .708-.708l3.5 3.5a.5.5 0 0 1 0 .708l-3.5 3.5a.5.5 0 0 1-.708-.708L13.293 8l-3.147-3.146z" stroke="gray" stroke-width="1.4"/></svg>') no-repeat center center;
+    content: '';
+    left: 0;
+    border-radius: 50%;
+    font-weight: 600;
+    text-align: center;
+    font-size: .75rem;
+    margin-top: .2rem;
+}
 .phpdocumentor-class-graph {
     width: 100%; height: 600px; border:1px solid black; overflow: hidden
 }
diff --git a/docs/files/nitric-api-abstractclient.html b/docs/files/nitric-api-abstractclient.html
index 97eb46d..05cc387 100644
--- a/docs/files/nitric-api-abstractclient.html
+++ b/docs/files/nitric-api-abstractclient.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-event.html b/docs/files/nitric-api-event.html
index d7a85ce..2748cbe 100644
--- a/docs/files/nitric-api-event.html
+++ b/docs/files/nitric-api-event.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-eventclient.html b/docs/files/nitric-api-eventclient.html
index 08138e1..71274cb 100644
--- a/docs/files/nitric-api-eventclient.html
+++ b/docs/files/nitric-api-eventclient.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-exception-abortedexception.html b/docs/files/nitric-api-exception-abortedexception.html
index 8f6fff2..408fb0e 100644
--- a/docs/files/nitric-api-exception-abortedexception.html
+++ b/docs/files/nitric-api-exception-abortedexception.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-exception-alreadyexistsexception.html b/docs/files/nitric-api-exception-alreadyexistsexception.html
index 0001b61..87f0cae 100644
--- a/docs/files/nitric-api-exception-alreadyexistsexception.html
+++ b/docs/files/nitric-api-exception-alreadyexistsexception.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-exception-cancelledexception.html b/docs/files/nitric-api-exception-cancelledexception.html
index 488b326..ddd165f 100644
--- a/docs/files/nitric-api-exception-cancelledexception.html
+++ b/docs/files/nitric-api-exception-cancelledexception.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-exception-datalossexception.html b/docs/files/nitric-api-exception-datalossexception.html
index 5d067e9..f265e65 100644
--- a/docs/files/nitric-api-exception-datalossexception.html
+++ b/docs/files/nitric-api-exception-datalossexception.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-exception-deadlineexceededexception.html b/docs/files/nitric-api-exception-deadlineexceededexception.html
index 70b0c34..d1d80ec 100644
--- a/docs/files/nitric-api-exception-deadlineexceededexception.html
+++ b/docs/files/nitric-api-exception-deadlineexceededexception.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-exception-failedpreconditionexception.html b/docs/files/nitric-api-exception-failedpreconditionexception.html
index 4af7429..cdc0e27 100644
--- a/docs/files/nitric-api-exception-failedpreconditionexception.html
+++ b/docs/files/nitric-api-exception-failedpreconditionexception.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-exception-internalexception.html b/docs/files/nitric-api-exception-internalexception.html
index 184853d..bc436c8 100644
--- a/docs/files/nitric-api-exception-internalexception.html
+++ b/docs/files/nitric-api-exception-internalexception.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-exception-invalidargumentexception.html b/docs/files/nitric-api-exception-invalidargumentexception.html
index 2dbf94f..6d06be8 100644
--- a/docs/files/nitric-api-exception-invalidargumentexception.html
+++ b/docs/files/nitric-api-exception-invalidargumentexception.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-exception-notfoundexception.html b/docs/files/nitric-api-exception-notfoundexception.html
index 14307ed..c0467a8 100644
--- a/docs/files/nitric-api-exception-notfoundexception.html
+++ b/docs/files/nitric-api-exception-notfoundexception.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-exception-outofrangeexception.html b/docs/files/nitric-api-exception-outofrangeexception.html
index 5cfbeca..00ecb57 100644
--- a/docs/files/nitric-api-exception-outofrangeexception.html
+++ b/docs/files/nitric-api-exception-outofrangeexception.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-exception-permissiondeniedexception.html b/docs/files/nitric-api-exception-permissiondeniedexception.html
index 17ef8dc..d935cbf 100644
--- a/docs/files/nitric-api-exception-permissiondeniedexception.html
+++ b/docs/files/nitric-api-exception-permissiondeniedexception.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-exception-resourceexhaustedexception.html b/docs/files/nitric-api-exception-resourceexhaustedexception.html
index ccb22b1..7f4be78 100644
--- a/docs/files/nitric-api-exception-resourceexhaustedexception.html
+++ b/docs/files/nitric-api-exception-resourceexhaustedexception.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-exception-unauthenticatedexception.html b/docs/files/nitric-api-exception-unauthenticatedexception.html
index 2683d3b..6d51e5a 100644
--- a/docs/files/nitric-api-exception-unauthenticatedexception.html
+++ b/docs/files/nitric-api-exception-unauthenticatedexception.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-exception-unavailableexception.html b/docs/files/nitric-api-exception-unavailableexception.html
index ddfbcb9..60e65cf 100644
--- a/docs/files/nitric-api-exception-unavailableexception.html
+++ b/docs/files/nitric-api-exception-unavailableexception.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-exception-unimplementedexception.html b/docs/files/nitric-api-exception-unimplementedexception.html
index 8f1eaad..0b3ef8b 100644
--- a/docs/files/nitric-api-exception-unimplementedexception.html
+++ b/docs/files/nitric-api-exception-unimplementedexception.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-failedtask.html b/docs/files/nitric-api-failedtask.html
index 46dcba4..39df51c 100644
--- a/docs/files/nitric-api-failedtask.html
+++ b/docs/files/nitric-api-failedtask.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-keyvalueclient.html b/docs/files/nitric-api-keyvalueclient.html
index 0a94f31..87bc9cb 100644
--- a/docs/files/nitric-api-keyvalueclient.html
+++ b/docs/files/nitric-api-keyvalueclient.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-queueclient.html b/docs/files/nitric-api-queueclient.html
index 827a711..c082c0b 100644
--- a/docs/files/nitric-api-queueclient.html
+++ b/docs/files/nitric-api-queueclient.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-storageclient.html b/docs/files/nitric-api-storageclient.html
index 2516d8f..2629b51 100644
--- a/docs/files/nitric-api-storageclient.html
+++ b/docs/files/nitric-api-storageclient.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-task.html b/docs/files/nitric-api-task.html
index afbd796..4f5b3f7 100644
--- a/docs/files/nitric-api-task.html
+++ b/docs/files/nitric-api-task.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-topicclient.html b/docs/files/nitric-api-topicclient.html
index a0d378a..cdbd1a1 100644
--- a/docs/files/nitric-api-topicclient.html
+++ b/docs/files/nitric-api-topicclient.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-api-userclient.html b/docs/files/nitric-api-userclient.html
index e64b8b8..d0fa722 100644
--- a/docs/files/nitric-api-userclient.html
+++ b/docs/files/nitric-api-userclient.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-faas-context.html b/docs/files/nitric-faas-context.html
index 4442d62..af2d430 100644
--- a/docs/files/nitric-faas-context.html
+++ b/docs/files/nitric-faas-context.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -118,7 +119,7 @@ <h3 id="interfaces_class_traits">
 <dl class="phpdocumentor-table-of-contents">
     
             <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a></dt>
-        <dd>Class Context represents the metadata of a FaaS request, including the source, payload type, unique request Id, etc.</dd>
+        <dd>Class Context represents the metadata of a FaaS request</dd>
     
     </dl>
 
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-faas-faas.html b/docs/files/nitric-faas-faas.html
index e5adf6d..b97e020 100644
--- a/docs/files/nitric-faas-faas.html
+++ b/docs/files/nitric-faas-faas.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-faas-httpcontext.html b/docs/files/nitric-faas-httpcontext.html
new file mode 100644
index 0000000..45fbbfe
--- /dev/null
+++ b/docs/files/nitric-faas-httpcontext.html
@@ -0,0 +1,159 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Documentation</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <base href="../">
+    <link rel="icon" href="images/favicon.ico"/>
+    <link rel="stylesheet" href="css/normalize.css">
+    <link rel="stylesheet" href="css/base.css">
+            <link rel="preconnect" href="https://fonts.gstatic.com">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link rel="stylesheet" href="css/template.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
+                <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
+        <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
+        <script src="js/search.js"></script>
+        <script defer src="js/searchIndex.js"></script>
+    </head>
+<body id="top">
+    <header class="phpdocumentor-header phpdocumentor-section">
+    <h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Documentation</a></h1>
+    <input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
+    <label class="phpdocumentor-header__menu-icon" for="menu-button">
+        <i class="fas fa-bars"></i>
+    </label>
+    <section data-search-form class="phpdocumentor-search">
+    <label>
+        <span class="visually-hidden">Search for</span>
+        <svg class="phpdocumentor-search__icon" width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <circle cx="7.5" cy="7.5" r="6.5" stroke="currentColor" stroke-width="2"/>
+            <line x1="12.4892" y1="12.2727" x2="19.1559" y2="18.9393" stroke="currentColor" stroke-width="3"/>
+        </svg>
+        <input type="search" class="phpdocumentor-field phpdocumentor-search__field" placeholder="Loading .." disabled />
+    </label>
+</section>
+
+    <nav class="phpdocumentor-topnav">
+    <ul class="phpdocumentor-topnav__menu">
+        </ul>
+</nav>
+</header>
+
+    <main class="phpdocumentor">
+        <div class="phpdocumentor-section">
+            <input class="phpdocumentor-sidebar__menu-button" type="checkbox" id="sidebar-button" name="sidebar-button" />
+<label class="phpdocumentor-sidebar__menu-icon" for="sidebar-button">
+    Menu
+</label>
+<aside class="phpdocumentor-column -four phpdocumentor-sidebar">
+        
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Namespaces</h2>
+                                                <h4 class="phpdocumentor-sidebar__root-namespace"><a href="namespaces/nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h4>
+                <ul class="phpdocumentor-list">
+                                            <li><a href="namespaces/nitric-api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                            <li><a href="namespaces/nitric-faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                                    </ul>
+                        </section>
+
+        <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Packages</h2>
+                    <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Default.html"><abbr title="\Default">Default</abbr></a></h3>
+                                <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h3>
+                        <ul class="phpdocumentor-list">
+                                    <li><a href="packages/Nitric-Api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                    <li><a href="packages/Nitric-Faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                            </ul>
+                        </section>
+    
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Reports</h2>
+                <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/deprecated.html">Deprecated</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/errors.html">Errors</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/markers.html">Markers</a></h3>
+    </section>
+
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Indices</h2>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="indices/files.html">Files</a></h3>
+    </section>
+</aside>
+
+            <div class="phpdocumentor-column -eight phpdocumentor-content">
+                    <ul class="phpdocumentor-breadcrumbs">
+    </ul>
+
+    <article class="phpdocumentor-element -file">
+        <h2 class="phpdocumentor-content__title">HttpContext.php</h2>
+
+            <p class="phpdocumentor-summary">Copyright 2021 Nitric Technologies Pty Ltd.</p>
+
+    <section class="phpdocumentor-description"><p>Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at</p>
+<pre class="prettyprint"><code class="prettyprint"> http://www.apache.org/licenses/LICENSE-2.0
+</code></pre>
+<p>Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.</p>
+</section>
+
+
+
+
+
+
+<h3 id="interfaces_class_traits">
+    Interfaces, Classes and Traits
+    <a href="#interfaces_class_traits" class="headerlink"><i class="fas fa-link"></i></a>
+</h3>
+
+<dl class="phpdocumentor-table-of-contents">
+    
+            <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a></dt>
+        <dd>Class Context represents the metadata of a FaaS request</dd>
+    
+    </dl>
+
+
+
+
+
+        
+
+        
+    </article>
+                <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
+    <section class="phpdocumentor-search-results__dialog">
+        <header class="phpdocumentor-search-results__header">
+            <h2 class="phpdocumentor-search-results__title">Search results</h2>
+            <button class="phpdocumentor-search-results__close"><i class="fas fa-times"></i></button>
+        </header>
+        <section class="phpdocumentor-search-results__body">
+            <ul class="phpdocumentor-search-results__entries"></ul>
+        </section>
+    </section>
+</section>
+            </div>
+        </div>
+        <a href="files/nitric-faas-httpcontext.html#top" class="phpdocumentor-back-to-top"><i class="fas fa-chevron-circle-up"></i></a>
+
+    </main>
+
+    <script>
+        cssVars({});
+    </script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
+</body>
+</html>
diff --git a/docs/files/nitric-faas-httpresponsecontext.html b/docs/files/nitric-faas-httpresponsecontext.html
new file mode 100644
index 0000000..d71e685
--- /dev/null
+++ b/docs/files/nitric-faas-httpresponsecontext.html
@@ -0,0 +1,159 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Documentation</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <base href="../">
+    <link rel="icon" href="images/favicon.ico"/>
+    <link rel="stylesheet" href="css/normalize.css">
+    <link rel="stylesheet" href="css/base.css">
+            <link rel="preconnect" href="https://fonts.gstatic.com">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link rel="stylesheet" href="css/template.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
+                <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
+        <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
+        <script src="js/search.js"></script>
+        <script defer src="js/searchIndex.js"></script>
+    </head>
+<body id="top">
+    <header class="phpdocumentor-header phpdocumentor-section">
+    <h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Documentation</a></h1>
+    <input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
+    <label class="phpdocumentor-header__menu-icon" for="menu-button">
+        <i class="fas fa-bars"></i>
+    </label>
+    <section data-search-form class="phpdocumentor-search">
+    <label>
+        <span class="visually-hidden">Search for</span>
+        <svg class="phpdocumentor-search__icon" width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <circle cx="7.5" cy="7.5" r="6.5" stroke="currentColor" stroke-width="2"/>
+            <line x1="12.4892" y1="12.2727" x2="19.1559" y2="18.9393" stroke="currentColor" stroke-width="3"/>
+        </svg>
+        <input type="search" class="phpdocumentor-field phpdocumentor-search__field" placeholder="Loading .." disabled />
+    </label>
+</section>
+
+    <nav class="phpdocumentor-topnav">
+    <ul class="phpdocumentor-topnav__menu">
+        </ul>
+</nav>
+</header>
+
+    <main class="phpdocumentor">
+        <div class="phpdocumentor-section">
+            <input class="phpdocumentor-sidebar__menu-button" type="checkbox" id="sidebar-button" name="sidebar-button" />
+<label class="phpdocumentor-sidebar__menu-icon" for="sidebar-button">
+    Menu
+</label>
+<aside class="phpdocumentor-column -four phpdocumentor-sidebar">
+        
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Namespaces</h2>
+                                                <h4 class="phpdocumentor-sidebar__root-namespace"><a href="namespaces/nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h4>
+                <ul class="phpdocumentor-list">
+                                            <li><a href="namespaces/nitric-api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                            <li><a href="namespaces/nitric-faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                                    </ul>
+                        </section>
+
+        <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Packages</h2>
+                    <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Default.html"><abbr title="\Default">Default</abbr></a></h3>
+                                <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h3>
+                        <ul class="phpdocumentor-list">
+                                    <li><a href="packages/Nitric-Api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                    <li><a href="packages/Nitric-Faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                            </ul>
+                        </section>
+    
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Reports</h2>
+                <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/deprecated.html">Deprecated</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/errors.html">Errors</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/markers.html">Markers</a></h3>
+    </section>
+
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Indices</h2>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="indices/files.html">Files</a></h3>
+    </section>
+</aside>
+
+            <div class="phpdocumentor-column -eight phpdocumentor-content">
+                    <ul class="phpdocumentor-breadcrumbs">
+    </ul>
+
+    <article class="phpdocumentor-element -file">
+        <h2 class="phpdocumentor-content__title">HttpResponseContext.php</h2>
+
+            <p class="phpdocumentor-summary">Copyright 2021 Nitric Technologies Pty Ltd.</p>
+
+    <section class="phpdocumentor-description"><p>Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at</p>
+<pre class="prettyprint"><code class="prettyprint"> http://www.apache.org/licenses/LICENSE-2.0
+</code></pre>
+<p>Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.</p>
+</section>
+
+
+
+
+
+
+<h3 id="interfaces_class_traits">
+    Interfaces, Classes and Traits
+    <a href="#interfaces_class_traits" class="headerlink"><i class="fas fa-link"></i></a>
+</h3>
+
+<dl class="phpdocumentor-table-of-contents">
+    
+            <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a></dt>
+        <dd></dd>
+    
+    </dl>
+
+
+
+
+
+        
+
+        
+    </article>
+                <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
+    <section class="phpdocumentor-search-results__dialog">
+        <header class="phpdocumentor-search-results__header">
+            <h2 class="phpdocumentor-search-results__title">Search results</h2>
+            <button class="phpdocumentor-search-results__close"><i class="fas fa-times"></i></button>
+        </header>
+        <section class="phpdocumentor-search-results__body">
+            <ul class="phpdocumentor-search-results__entries"></ul>
+        </section>
+    </section>
+</section>
+            </div>
+        </div>
+        <a href="files/nitric-faas-httpresponsecontext.html#top" class="phpdocumentor-back-to-top"><i class="fas fa-chevron-circle-up"></i></a>
+
+    </main>
+
+    <script>
+        cssVars({});
+    </script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
+</body>
+</html>
diff --git a/docs/files/nitric-faas-logger.html b/docs/files/nitric-faas-logger.html
index be78ac9..e79dfc9 100644
--- a/docs/files/nitric-faas-logger.html
+++ b/docs/files/nitric-faas-logger.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-faas-request.html b/docs/files/nitric-faas-request.html
index 8c2a466..469aaa5 100644
--- a/docs/files/nitric-faas-request.html
+++ b/docs/files/nitric-faas-request.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-faas-response.html b/docs/files/nitric-faas-response.html
index 7502850..6fde238 100644
--- a/docs/files/nitric-faas-response.html
+++ b/docs/files/nitric-faas-response.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -154,5 +155,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-faas-responsecontext.html b/docs/files/nitric-faas-responsecontext.html
new file mode 100644
index 0000000..55f3391
--- /dev/null
+++ b/docs/files/nitric-faas-responsecontext.html
@@ -0,0 +1,159 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Documentation</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <base href="../">
+    <link rel="icon" href="images/favicon.ico"/>
+    <link rel="stylesheet" href="css/normalize.css">
+    <link rel="stylesheet" href="css/base.css">
+            <link rel="preconnect" href="https://fonts.gstatic.com">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link rel="stylesheet" href="css/template.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
+                <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
+        <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
+        <script src="js/search.js"></script>
+        <script defer src="js/searchIndex.js"></script>
+    </head>
+<body id="top">
+    <header class="phpdocumentor-header phpdocumentor-section">
+    <h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Documentation</a></h1>
+    <input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
+    <label class="phpdocumentor-header__menu-icon" for="menu-button">
+        <i class="fas fa-bars"></i>
+    </label>
+    <section data-search-form class="phpdocumentor-search">
+    <label>
+        <span class="visually-hidden">Search for</span>
+        <svg class="phpdocumentor-search__icon" width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <circle cx="7.5" cy="7.5" r="6.5" stroke="currentColor" stroke-width="2"/>
+            <line x1="12.4892" y1="12.2727" x2="19.1559" y2="18.9393" stroke="currentColor" stroke-width="3"/>
+        </svg>
+        <input type="search" class="phpdocumentor-field phpdocumentor-search__field" placeholder="Loading .." disabled />
+    </label>
+</section>
+
+    <nav class="phpdocumentor-topnav">
+    <ul class="phpdocumentor-topnav__menu">
+        </ul>
+</nav>
+</header>
+
+    <main class="phpdocumentor">
+        <div class="phpdocumentor-section">
+            <input class="phpdocumentor-sidebar__menu-button" type="checkbox" id="sidebar-button" name="sidebar-button" />
+<label class="phpdocumentor-sidebar__menu-icon" for="sidebar-button">
+    Menu
+</label>
+<aside class="phpdocumentor-column -four phpdocumentor-sidebar">
+        
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Namespaces</h2>
+                                                <h4 class="phpdocumentor-sidebar__root-namespace"><a href="namespaces/nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h4>
+                <ul class="phpdocumentor-list">
+                                            <li><a href="namespaces/nitric-api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                            <li><a href="namespaces/nitric-faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                                    </ul>
+                        </section>
+
+        <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Packages</h2>
+                    <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Default.html"><abbr title="\Default">Default</abbr></a></h3>
+                                <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h3>
+                        <ul class="phpdocumentor-list">
+                                    <li><a href="packages/Nitric-Api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                    <li><a href="packages/Nitric-Faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                            </ul>
+                        </section>
+    
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Reports</h2>
+                <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/deprecated.html">Deprecated</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/errors.html">Errors</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/markers.html">Markers</a></h3>
+    </section>
+
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Indices</h2>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="indices/files.html">Files</a></h3>
+    </section>
+</aside>
+
+            <div class="phpdocumentor-column -eight phpdocumentor-content">
+                    <ul class="phpdocumentor-breadcrumbs">
+    </ul>
+
+    <article class="phpdocumentor-element -file">
+        <h2 class="phpdocumentor-content__title">ResponseContext.php</h2>
+
+            <p class="phpdocumentor-summary">Copyright 2021 Nitric Technologies Pty Ltd.</p>
+
+    <section class="phpdocumentor-description"><p>Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at</p>
+<pre class="prettyprint"><code class="prettyprint"> http://www.apache.org/licenses/LICENSE-2.0
+</code></pre>
+<p>Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.</p>
+</section>
+
+
+
+
+
+
+<h3 id="interfaces_class_traits">
+    Interfaces, Classes and Traits
+    <a href="#interfaces_class_traits" class="headerlink"><i class="fas fa-link"></i></a>
+</h3>
+
+<dl class="phpdocumentor-table-of-contents">
+    
+            <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-ResponseContext.html"><abbr title="\Nitric\Faas\ResponseContext">ResponseContext</abbr></a></dt>
+        <dd></dd>
+    
+    </dl>
+
+
+
+
+
+        
+
+        
+    </article>
+                <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
+    <section class="phpdocumentor-search-results__dialog">
+        <header class="phpdocumentor-search-results__header">
+            <h2 class="phpdocumentor-search-results__title">Search results</h2>
+            <button class="phpdocumentor-search-results__close"><i class="fas fa-times"></i></button>
+        </header>
+        <section class="phpdocumentor-search-results__body">
+            <ul class="phpdocumentor-search-results__entries"></ul>
+        </section>
+    </section>
+</section>
+            </div>
+        </div>
+        <a href="files/nitric-faas-responsecontext.html#top" class="phpdocumentor-back-to-top"><i class="fas fa-chevron-circle-up"></i></a>
+
+    </main>
+
+    <script>
+        cssVars({});
+    </script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
+</body>
+</html>
diff --git a/docs/files/nitric-faas-sourcetype.html b/docs/files/nitric-faas-sourcetype.html
index 3912339..51ea167 100644
--- a/docs/files/nitric-faas-sourcetype.html
+++ b/docs/files/nitric-faas-sourcetype.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -153,5 +154,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/files/nitric-faas-topiccontext.html b/docs/files/nitric-faas-topiccontext.html
new file mode 100644
index 0000000..30807b0
--- /dev/null
+++ b/docs/files/nitric-faas-topiccontext.html
@@ -0,0 +1,159 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Documentation</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <base href="../">
+    <link rel="icon" href="images/favicon.ico"/>
+    <link rel="stylesheet" href="css/normalize.css">
+    <link rel="stylesheet" href="css/base.css">
+            <link rel="preconnect" href="https://fonts.gstatic.com">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link rel="stylesheet" href="css/template.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
+                <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
+        <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
+        <script src="js/search.js"></script>
+        <script defer src="js/searchIndex.js"></script>
+    </head>
+<body id="top">
+    <header class="phpdocumentor-header phpdocumentor-section">
+    <h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Documentation</a></h1>
+    <input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
+    <label class="phpdocumentor-header__menu-icon" for="menu-button">
+        <i class="fas fa-bars"></i>
+    </label>
+    <section data-search-form class="phpdocumentor-search">
+    <label>
+        <span class="visually-hidden">Search for</span>
+        <svg class="phpdocumentor-search__icon" width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <circle cx="7.5" cy="7.5" r="6.5" stroke="currentColor" stroke-width="2"/>
+            <line x1="12.4892" y1="12.2727" x2="19.1559" y2="18.9393" stroke="currentColor" stroke-width="3"/>
+        </svg>
+        <input type="search" class="phpdocumentor-field phpdocumentor-search__field" placeholder="Loading .." disabled />
+    </label>
+</section>
+
+    <nav class="phpdocumentor-topnav">
+    <ul class="phpdocumentor-topnav__menu">
+        </ul>
+</nav>
+</header>
+
+    <main class="phpdocumentor">
+        <div class="phpdocumentor-section">
+            <input class="phpdocumentor-sidebar__menu-button" type="checkbox" id="sidebar-button" name="sidebar-button" />
+<label class="phpdocumentor-sidebar__menu-icon" for="sidebar-button">
+    Menu
+</label>
+<aside class="phpdocumentor-column -four phpdocumentor-sidebar">
+        
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Namespaces</h2>
+                                                <h4 class="phpdocumentor-sidebar__root-namespace"><a href="namespaces/nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h4>
+                <ul class="phpdocumentor-list">
+                                            <li><a href="namespaces/nitric-api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                            <li><a href="namespaces/nitric-faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                                    </ul>
+                        </section>
+
+        <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Packages</h2>
+                    <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Default.html"><abbr title="\Default">Default</abbr></a></h3>
+                                <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h3>
+                        <ul class="phpdocumentor-list">
+                                    <li><a href="packages/Nitric-Api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                    <li><a href="packages/Nitric-Faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                            </ul>
+                        </section>
+    
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Reports</h2>
+                <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/deprecated.html">Deprecated</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/errors.html">Errors</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/markers.html">Markers</a></h3>
+    </section>
+
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Indices</h2>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="indices/files.html">Files</a></h3>
+    </section>
+</aside>
+
+            <div class="phpdocumentor-column -eight phpdocumentor-content">
+                    <ul class="phpdocumentor-breadcrumbs">
+    </ul>
+
+    <article class="phpdocumentor-element -file">
+        <h2 class="phpdocumentor-content__title">TopicContext.php</h2>
+
+            <p class="phpdocumentor-summary">Copyright 2021 Nitric Technologies Pty Ltd.</p>
+
+    <section class="phpdocumentor-description"><p>Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at</p>
+<pre class="prettyprint"><code class="prettyprint"> http://www.apache.org/licenses/LICENSE-2.0
+</code></pre>
+<p>Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.</p>
+</section>
+
+
+
+
+
+
+<h3 id="interfaces_class_traits">
+    Interfaces, Classes and Traits
+    <a href="#interfaces_class_traits" class="headerlink"><i class="fas fa-link"></i></a>
+</h3>
+
+<dl class="phpdocumentor-table-of-contents">
+    
+            <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a></dt>
+        <dd>Class Context represents the metadata of a FaaS request</dd>
+    
+    </dl>
+
+
+
+
+
+        
+
+        
+    </article>
+                <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
+    <section class="phpdocumentor-search-results__dialog">
+        <header class="phpdocumentor-search-results__header">
+            <h2 class="phpdocumentor-search-results__title">Search results</h2>
+            <button class="phpdocumentor-search-results__close"><i class="fas fa-times"></i></button>
+        </header>
+        <section class="phpdocumentor-search-results__body">
+            <ul class="phpdocumentor-search-results__entries"></ul>
+        </section>
+    </section>
+</section>
+            </div>
+        </div>
+        <a href="files/nitric-faas-topiccontext.html#top" class="phpdocumentor-back-to-top"><i class="fas fa-chevron-circle-up"></i></a>
+
+    </main>
+
+    <script>
+        cssVars({});
+    </script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
+</body>
+</html>
diff --git a/docs/files/nitric-faas-topicresponsecontext.html b/docs/files/nitric-faas-topicresponsecontext.html
new file mode 100644
index 0000000..aa8dc4c
--- /dev/null
+++ b/docs/files/nitric-faas-topicresponsecontext.html
@@ -0,0 +1,159 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Documentation</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <base href="../">
+    <link rel="icon" href="images/favicon.ico"/>
+    <link rel="stylesheet" href="css/normalize.css">
+    <link rel="stylesheet" href="css/base.css">
+            <link rel="preconnect" href="https://fonts.gstatic.com">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link rel="stylesheet" href="css/template.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
+                <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
+        <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
+        <script src="js/search.js"></script>
+        <script defer src="js/searchIndex.js"></script>
+    </head>
+<body id="top">
+    <header class="phpdocumentor-header phpdocumentor-section">
+    <h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Documentation</a></h1>
+    <input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
+    <label class="phpdocumentor-header__menu-icon" for="menu-button">
+        <i class="fas fa-bars"></i>
+    </label>
+    <section data-search-form class="phpdocumentor-search">
+    <label>
+        <span class="visually-hidden">Search for</span>
+        <svg class="phpdocumentor-search__icon" width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <circle cx="7.5" cy="7.5" r="6.5" stroke="currentColor" stroke-width="2"/>
+            <line x1="12.4892" y1="12.2727" x2="19.1559" y2="18.9393" stroke="currentColor" stroke-width="3"/>
+        </svg>
+        <input type="search" class="phpdocumentor-field phpdocumentor-search__field" placeholder="Loading .." disabled />
+    </label>
+</section>
+
+    <nav class="phpdocumentor-topnav">
+    <ul class="phpdocumentor-topnav__menu">
+        </ul>
+</nav>
+</header>
+
+    <main class="phpdocumentor">
+        <div class="phpdocumentor-section">
+            <input class="phpdocumentor-sidebar__menu-button" type="checkbox" id="sidebar-button" name="sidebar-button" />
+<label class="phpdocumentor-sidebar__menu-icon" for="sidebar-button">
+    Menu
+</label>
+<aside class="phpdocumentor-column -four phpdocumentor-sidebar">
+        
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Namespaces</h2>
+                                                <h4 class="phpdocumentor-sidebar__root-namespace"><a href="namespaces/nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h4>
+                <ul class="phpdocumentor-list">
+                                            <li><a href="namespaces/nitric-api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                            <li><a href="namespaces/nitric-faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                                    </ul>
+                        </section>
+
+        <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Packages</h2>
+                    <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Default.html"><abbr title="\Default">Default</abbr></a></h3>
+                                <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h3>
+                        <ul class="phpdocumentor-list">
+                                    <li><a href="packages/Nitric-Api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                    <li><a href="packages/Nitric-Faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                            </ul>
+                        </section>
+    
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Reports</h2>
+                <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/deprecated.html">Deprecated</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/errors.html">Errors</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/markers.html">Markers</a></h3>
+    </section>
+
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Indices</h2>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="indices/files.html">Files</a></h3>
+    </section>
+</aside>
+
+            <div class="phpdocumentor-column -eight phpdocumentor-content">
+                    <ul class="phpdocumentor-breadcrumbs">
+    </ul>
+
+    <article class="phpdocumentor-element -file">
+        <h2 class="phpdocumentor-content__title">TopicResponseContext.php</h2>
+
+            <p class="phpdocumentor-summary">Copyright 2021 Nitric Technologies Pty Ltd.</p>
+
+    <section class="phpdocumentor-description"><p>Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at</p>
+<pre class="prettyprint"><code class="prettyprint"> http://www.apache.org/licenses/LICENSE-2.0
+</code></pre>
+<p>Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.</p>
+</section>
+
+
+
+
+
+
+<h3 id="interfaces_class_traits">
+    Interfaces, Classes and Traits
+    <a href="#interfaces_class_traits" class="headerlink"><i class="fas fa-link"></i></a>
+</h3>
+
+<dl class="phpdocumentor-table-of-contents">
+    
+            <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a></dt>
+        <dd></dd>
+    
+    </dl>
+
+
+
+
+
+        
+
+        
+    </article>
+                <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
+    <section class="phpdocumentor-search-results__dialog">
+        <header class="phpdocumentor-search-results__header">
+            <h2 class="phpdocumentor-search-results__title">Search results</h2>
+            <button class="phpdocumentor-search-results__close"><i class="fas fa-times"></i></button>
+        </header>
+        <section class="phpdocumentor-search-results__body">
+            <ul class="phpdocumentor-search-results__entries"></ul>
+        </section>
+    </section>
+</section>
+            </div>
+        </div>
+        <a href="files/nitric-faas-topicresponsecontext.html#top" class="phpdocumentor-back-to-top"><i class="fas fa-chevron-circle-up"></i></a>
+
+    </main>
+
+    <script>
+        cssVars({});
+    </script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
+</body>
+</html>
diff --git a/docs/graphs/classes.html b/docs/graphs/classes.html
index b66a42d..6a2f9f0 100644
--- a/docs/graphs/classes.html
+++ b/docs/graphs/classes.html
@@ -109,5 +109,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/index.html b/docs/index.html
index 0e435b3..bca677d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -136,5 +137,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/indices/files.html b/docs/indices/files.html
index cc66861..2a4fd4d 100644
--- a/docs/indices/files.html
+++ b/docs/indices/files.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -114,7 +115,12 @@ <h3>F</h3>
                     <li><a href="files/nitric-api-exception-failedpreconditionexception.html"><abbr title="Nitric/Api/Exception/FailedPreconditionException.php">FailedPreconditionException.php</abbr></a></li>
                     <li><a href="files/nitric-api-failedtask.html"><abbr title="Nitric/Api/FailedTask.php">FailedTask.php</abbr></a></li>
                 </ul>
-                                                                            <h3>I</h3>
+                                                        <h3>H</h3>
+        <ul class="phpdocumentor-list">
+                    <li><a href="files/nitric-faas-httpcontext.html"><abbr title="Nitric/Faas/HttpContext.php">HttpContext.php</abbr></a></li>
+                    <li><a href="files/nitric-faas-httpresponsecontext.html"><abbr title="Nitric/Faas/HttpResponseContext.php">HttpResponseContext.php</abbr></a></li>
+                </ul>
+                                    <h3>I</h3>
         <ul class="phpdocumentor-list">
                     <li><a href="files/nitric-api-exception-internalexception.html"><abbr title="Nitric/Api/Exception/InternalException.php">InternalException.php</abbr></a></li>
                     <li><a href="files/nitric-api-exception-invalidargumentexception.html"><abbr title="Nitric/Api/Exception/InvalidArgumentException.php">InvalidArgumentException.php</abbr></a></li>
@@ -148,6 +154,7 @@ <h3>R</h3>
                     <li><a href="files/nitric-faas-request.html"><abbr title="Nitric/Faas/Request.php">Request.php</abbr></a></li>
                     <li><a href="files/nitric-api-exception-resourceexhaustedexception.html"><abbr title="Nitric/Api/Exception/ResourceExhaustedException.php">ResourceExhaustedException.php</abbr></a></li>
                     <li><a href="files/nitric-faas-response.html"><abbr title="Nitric/Faas/Response.php">Response.php</abbr></a></li>
+                    <li><a href="files/nitric-faas-responsecontext.html"><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></a></li>
                 </ul>
                                     <h3>S</h3>
         <ul class="phpdocumentor-list">
@@ -158,6 +165,8 @@ <h3>T</h3>
         <ul class="phpdocumentor-list">
                     <li><a href="files/nitric-api-task.html"><abbr title="Nitric/Api/Task.php">Task.php</abbr></a></li>
                     <li><a href="files/nitric-api-topicclient.html"><abbr title="Nitric/Api/TopicClient.php">TopicClient.php</abbr></a></li>
+                    <li><a href="files/nitric-faas-topiccontext.html"><abbr title="Nitric/Faas/TopicContext.php">TopicContext.php</abbr></a></li>
+                    <li><a href="files/nitric-faas-topicresponsecontext.html"><abbr title="Nitric/Faas/TopicResponseContext.php">TopicResponseContext.php</abbr></a></li>
                 </ul>
                                     <h3>U</h3>
         <ul class="phpdocumentor-list">
@@ -189,5 +198,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/js/searchIndex.js b/docs/js/searchIndex.js
index 3a0798b..89518b0 100644
--- a/docs/js/searchIndex.js
+++ b/docs/js/searchIndex.js
@@ -443,103 +443,133 @@ Search.appendIndex(
         },                {
             "fqsen": "\\Nitric\\Faas\\Context",
             "name": "Context",
-            "summary": "Class\u0020Context\u0020represents\u0020the\u0020metadata\u0020of\u0020a\u0020FaaS\u0020request,\u0020including\u0020the\u0020source,\u0020payload\u0020type,\u0020unique\u0020request\u0020Id,\u0020etc.",
+            "summary": "Class\u0020Context\u0020represents\u0020the\u0020metadata\u0020of\u0020a\u0020FaaS\u0020request",
             "url": "classes/Nitric-Faas-Context.html"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003A__construct\u0028\u0029",
-            "name": "__construct",
-            "summary": "Context\u0020constructor.",
-            "url": "classes/Nitric-Faas-Context.html#method___construct"
+            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003AisTopic\u0028\u0029",
+            "name": "isTopic",
+            "summary": "",
+            "url": "classes/Nitric-Faas-Context.html#method_isTopic"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003AgetValueIfExists\u0028\u0029",
-            "name": "getValueIfExists",
+            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003AisHttp\u0028\u0029",
+            "name": "isHttp",
             "summary": "",
-            "url": "classes/Nitric-Faas-Context.html#method_getValueIfExists"
+            "url": "classes/Nitric-Faas-Context.html#method_isHttp"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003AfromHeaders\u0028\u0029",
-            "name": "fromHeaders",
+            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003AasTopicContext\u0028\u0029",
+            "name": "asTopicContext",
             "summary": "",
-            "url": "classes/Nitric-Faas-Context.html#method_fromHeaders"
+            "url": "classes/Nitric-Faas-Context.html#method_asTopicContext"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003AgetRequestID\u0028\u0029",
-            "name": "getRequestID",
+            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003AasHttpContext\u0028\u0029",
+            "name": "asHttpContext",
             "summary": "",
-            "url": "classes/Nitric-Faas-Context.html#method_getRequestID"
+            "url": "classes/Nitric-Faas-Context.html#method_asHttpContext"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003AsetRequestID\u0028\u0029",
-            "name": "setRequestID",
+            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003AfromHttpTriggerContext\u0028\u0029",
+            "name": "fromHttpTriggerContext",
             "summary": "",
-            "url": "classes/Nitric-Faas-Context.html#method_setRequestID"
+            "url": "classes/Nitric-Faas-Context.html#method_fromHttpTriggerContext"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003AgetSource\u0028\u0029",
-            "name": "getSource",
+            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003AfromTopicTriggerContext\u0028\u0029",
+            "name": "fromTopicTriggerContext",
             "summary": "",
-            "url": "classes/Nitric-Faas-Context.html#method_getSource"
+            "url": "classes/Nitric-Faas-Context.html#method_fromTopicTriggerContext"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003AsetSource\u0028\u0029",
-            "name": "setSource",
+            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003AfromTriggerRequest\u0028\u0029",
+            "name": "fromTriggerRequest",
             "summary": "",
-            "url": "classes/Nitric-Faas-Context.html#method_setSource"
+            "url": "classes/Nitric-Faas-Context.html#method_fromTriggerRequest"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\Faas",
+            "name": "Faas",
+            "summary": "Function\u002Das\u002Da\u002DService\u0020\u0028Faas\u0029\u0020class\u0020provides\u0020method\u0020that\u0020assist\u0020in\u0020writing\u0020Serverless\u0020Functions,\u0020using\u0020PHP.",
+            "url": "classes/Nitric-Faas-Faas.html"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\Faas\u003A\u003Astart\u0028\u0029",
+            "name": "start",
+            "summary": "Begin\u0020handling\u0020FaaS\u0020triggers\u0020such\u0020as\u0020HTTP\u0020requests\u0020and\u0020Events.",
+            "url": "classes/Nitric-Faas-Faas.html#method_start"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003AgetSourceType\u0028\u0029",
-            "name": "getSourceType",
+            "fqsen": "\\Nitric\\Faas\\Faas\u003A\u003ASERVICE_ADDRESS",
+            "name": "SERVICE_ADDRESS",
             "summary": "",
-            "url": "classes/Nitric-Faas-Context.html#method_getSourceType"
+            "url": "classes/Nitric-Faas-Faas.html#constant_SERVICE_ADDRESS"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\HttpContext",
+            "name": "HttpContext",
+            "summary": "Class\u0020Context\u0020represents\u0020the\u0020metadata\u0020of\u0020a\u0020FaaS\u0020request",
+            "url": "classes/Nitric-Faas-HttpContext.html"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003AsetSourceType\u0028\u0029",
-            "name": "setSourceType",
+            "fqsen": "\\Nitric\\Faas\\HttpContext\u003A\u003A__construct\u0028\u0029",
+            "name": "__construct",
             "summary": "",
-            "url": "classes/Nitric-Faas-Context.html#method_setSourceType"
+            "url": "classes/Nitric-Faas-HttpContext.html#method___construct"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003AgetPayloadType\u0028\u0029",
-            "name": "getPayloadType",
+            "fqsen": "\\Nitric\\Faas\\HttpContext\u003A\u003AgetMethod\u0028\u0029",
+            "name": "getMethod",
             "summary": "",
-            "url": "classes/Nitric-Faas-Context.html#method_getPayloadType"
+            "url": "classes/Nitric-Faas-HttpContext.html#method_getMethod"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003AsetPayloadType\u0028\u0029",
-            "name": "setPayloadType",
+            "fqsen": "\\Nitric\\Faas\\HttpContext\u003A\u003AgetHeaders\u0028\u0029",
+            "name": "getHeaders",
             "summary": "",
-            "url": "classes/Nitric-Faas-Context.html#method_setPayloadType"
+            "url": "classes/Nitric-Faas-HttpContext.html#method_getHeaders"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003A\u0024requestID",
-            "name": "requestID",
+            "fqsen": "\\Nitric\\Faas\\HttpContext\u003A\u003AgetQueryParams\u0028\u0029",
+            "name": "getQueryParams",
             "summary": "",
-            "url": "classes/Nitric-Faas-Context.html#property_requestID"
+            "url": "classes/Nitric-Faas-HttpContext.html#method_getQueryParams"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003A\u0024source",
-            "name": "source",
+            "fqsen": "\\Nitric\\Faas\\HttpContext\u003A\u003AgetPathParams\u0028\u0029",
+            "name": "getPathParams",
             "summary": "",
-            "url": "classes/Nitric-Faas-Context.html#property_source"
+            "url": "classes/Nitric-Faas-HttpContext.html#method_getPathParams"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003A\u0024sourceType",
-            "name": "sourceType",
+            "fqsen": "\\Nitric\\Faas\\HttpContext\u003A\u003A\u0024method",
+            "name": "method",
             "summary": "",
-            "url": "classes/Nitric-Faas-Context.html#property_sourceType"
+            "url": "classes/Nitric-Faas-HttpContext.html#property_method"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Context\u003A\u003A\u0024payloadType",
-            "name": "payloadType",
+            "fqsen": "\\Nitric\\Faas\\HttpContext\u003A\u003A\u0024headers",
+            "name": "headers",
             "summary": "",
-            "url": "classes/Nitric-Faas-Context.html#property_payloadType"
+            "url": "classes/Nitric-Faas-HttpContext.html#property_headers"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Faas",
-            "name": "Faas",
-            "summary": "Function\u002Das\u002Da\u002DService\u0020\u0028Faas\u0029\u0020class\u0020provides\u0020method\u0020that\u0020assist\u0020in\u0020writing\u0020Serverless\u0020Functions,\u0020using\u0020PHP.",
-            "url": "classes/Nitric-Faas-Faas.html"
+            "fqsen": "\\Nitric\\Faas\\HttpContext\u003A\u003A\u0024queryParams",
+            "name": "queryParams",
+            "summary": "",
+            "url": "classes/Nitric-Faas-HttpContext.html#property_queryParams"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Faas\u003A\u003Astart\u0028\u0029",
-            "name": "start",
-            "summary": "Begin\u0020handling\u0020FaaS\u0020triggers\u0020such\u0020as\u0020HTTP\u0020requests\u0020and\u0020Events.",
-            "url": "classes/Nitric-Faas-Faas.html#method_start"
+            "fqsen": "\\Nitric\\Faas\\HttpContext\u003A\u003A\u0024pathParams",
+            "name": "pathParams",
+            "summary": "",
+            "url": "classes/Nitric-Faas-HttpContext.html#property_pathParams"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Faas\u003A\u003AhttpResponse\u0028\u0029",
-            "name": "httpResponse",
-            "summary": "Convert\u0020a\u0020NitricResponse\u0020to\u0020a\u0020HTTP\u0020response.\u0020Used\u0020when\u0020the\u0020FaaS\u0020service\u0020is\u0020operating\u0020as\u0020an\u0020HTTP\u0020server.",
-            "url": "classes/Nitric-Faas-Faas.html#method_httpResponse"
+            "fqsen": "\\Nitric\\Faas\\HttpResponseContext",
+            "name": "HttpResponseContext",
+            "summary": "",
+            "url": "classes/Nitric-Faas-HttpResponseContext.html"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Faas\u003A\u003ACHILD_ADDRESS",
-            "name": "CHILD_ADDRESS",
-            "summary": "Bind\u0020address\u0020for\u0020the\u0020FaaS\u0020service,\u0020defaults\u0020to\u0020\u0022127.0.0.1\u003A8080\u0022.",
-            "url": "classes/Nitric-Faas-Faas.html#constant_CHILD_ADDRESS"
+            "fqsen": "\\Nitric\\Faas\\HttpResponseContext\u003A\u003A__construct\u0028\u0029",
+            "name": "__construct",
+            "summary": "",
+            "url": "classes/Nitric-Faas-HttpResponseContext.html#method___construct"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\HttpResponseContext\u003A\u003AtoGrpcResponseContext\u0028\u0029",
+            "name": "toGrpcResponseContext",
+            "summary": "",
+            "url": "classes/Nitric-Faas-HttpResponseContext.html#method_toGrpcResponseContext"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\HttpResponseContext\u003A\u003A\u0024headers",
+            "name": "headers",
+            "summary": "",
+            "url": "classes/Nitric-Faas-HttpResponseContext.html#property_headers"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\HttpResponseContext\u003A\u003A\u0024status",
+            "name": "status",
+            "summary": "",
+            "url": "classes/Nitric-Faas-HttpResponseContext.html#property_status"
         },                {
             "fqsen": "\\Nitric\\Faas\\Logger",
             "name": "Logger",
@@ -566,110 +596,110 @@ Search.appendIndex(
             "summary": "Request\u0020constructor.",
             "url": "classes/Nitric-Faas-Request.html#method___construct"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Request\u003A\u003AfromHTTPRequest\u0028\u0029",
-            "name": "fromHTTPRequest",
-            "summary": "Return\u0020a\u0020Request\u0020from\u0020an\u0020HTTP\u0020request\u0020using\u0020standard\u0020conventions.\u0020Used\u0020when\u0020FaaS\u0020services\u0020is\u0020operating\u0020as\nan\u0020HTTP\u0020server.",
-            "url": "classes/Nitric-Faas-Request.html#method_fromHTTPRequest"
+            "fqsen": "\\Nitric\\Faas\\Request\u003A\u003AfromTriggerRequest\u0028\u0029",
+            "name": "fromTriggerRequest",
+            "summary": "Return\u0020a\u0020Request\u0020from\u0020an\u0020NitricTriggerRequest",
+            "url": "classes/Nitric-Faas-Request.html#method_fromTriggerRequest"
         },                {
             "fqsen": "\\Nitric\\Faas\\Request\u003A\u003AgetContext\u0028\u0029",
             "name": "getContext",
             "summary": "",
             "url": "classes/Nitric-Faas-Request.html#method_getContext"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Request\u003A\u003AsetContext\u0028\u0029",
-            "name": "setContext",
+            "fqsen": "\\Nitric\\Faas\\Request\u003A\u003AgetData\u0028\u0029",
+            "name": "getData",
             "summary": "",
-            "url": "classes/Nitric-Faas-Request.html#method_setContext"
+            "url": "classes/Nitric-Faas-Request.html#method_getData"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Request\u003A\u003AgetPayload\u0028\u0029",
-            "name": "getPayload",
+            "fqsen": "\\Nitric\\Faas\\Request\u003A\u003AgetDefaultResponse\u0028\u0029",
+            "name": "getDefaultResponse",
             "summary": "",
-            "url": "classes/Nitric-Faas-Request.html#method_getPayload"
-        },                {
-            "fqsen": "\\Nitric\\Faas\\Request\u003A\u003AsetPayload\u0028\u0029",
-            "name": "setPayload",
-            "summary": "",
-            "url": "classes/Nitric-Faas-Request.html#method_setPayload"
-        },                {
-            "fqsen": "\\Nitric\\Faas\\Request\u003A\u003AgetPath\u0028\u0029",
-            "name": "getPath",
-            "summary": "",
-            "url": "classes/Nitric-Faas-Request.html#method_getPath"
-        },                {
-            "fqsen": "\\Nitric\\Faas\\Request\u003A\u003AsetPath\u0028\u0029",
-            "name": "setPath",
-            "summary": "",
-            "url": "classes/Nitric-Faas-Request.html#method_setPath"
+            "url": "classes/Nitric-Faas-Request.html#method_getDefaultResponse"
         },                {
             "fqsen": "\\Nitric\\Faas\\Request\u003A\u003A\u0024context",
             "name": "context",
             "summary": "",
             "url": "classes/Nitric-Faas-Request.html#property_context"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Request\u003A\u003A\u0024payload",
-            "name": "payload",
-            "summary": "",
-            "url": "classes/Nitric-Faas-Request.html#property_payload"
-        },                {
-            "fqsen": "\\Nitric\\Faas\\Request\u003A\u003A\u0024path",
-            "name": "path",
+            "fqsen": "\\Nitric\\Faas\\Request\u003A\u003A\u0024data",
+            "name": "data",
             "summary": "",
-            "url": "classes/Nitric-Faas-Request.html#property_path"
+            "url": "classes/Nitric-Faas-Request.html#property_data"
         },                {
             "fqsen": "\\Nitric\\Faas\\Response",
             "name": "Response",
             "summary": "Class\u0020Response\u0020represents\u0020a\u0020normalized\u0020response\u0020in\u0020the\u0020Nitric\u0020runtime.\u0020Will\u0020be\u0020converted\u0020to\u0020a\u0020specific\u0020response\u0020type\nsuch\u0020as\u0020an\u0020HTTP\u0020response,\u0020depending\u0020on\u0020runtime\u0020environment.",
             "url": "classes/Nitric-Faas-Response.html"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Response\u003A\u003AgetBody\u0028\u0029",
-            "name": "getBody",
+            "fqsen": "\\Nitric\\Faas\\Response\u003A\u003AsetData\u0028\u0029",
+            "name": "setData",
             "summary": "",
-            "url": "classes/Nitric-Faas-Response.html#method_getBody"
+            "url": "classes/Nitric-Faas-Response.html#method_setData"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Response\u003A\u003AsetBody\u0028\u0029",
-            "name": "setBody",
+            "fqsen": "\\Nitric\\Faas\\Response\u003A\u003AsetContext\u0028\u0029",
+            "name": "setContext",
             "summary": "",
-            "url": "classes/Nitric-Faas-Response.html#method_setBody"
+            "url": "classes/Nitric-Faas-Response.html#method_setContext"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Response\u003A\u003AgetStatus\u0028\u0029",
-            "name": "getStatus",
+            "fqsen": "\\Nitric\\Faas\\Response\u003A\u003AgetContext\u0028\u0029",
+            "name": "getContext",
             "summary": "",
-            "url": "classes/Nitric-Faas-Response.html#method_getStatus"
+            "url": "classes/Nitric-Faas-Response.html#method_getContext"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Response\u003A\u003AsetStatus\u0028\u0029",
-            "name": "setStatus",
+            "fqsen": "\\Nitric\\Faas\\Response\u003A\u003AgetData\u0028\u0029",
+            "name": "getData",
             "summary": "",
-            "url": "classes/Nitric-Faas-Response.html#method_setStatus"
+            "url": "classes/Nitric-Faas-Response.html#method_getData"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Response\u003A\u003AgetHeaders\u0028\u0029",
-            "name": "getHeaders",
+            "fqsen": "\\Nitric\\Faas\\Response\u003A\u003AtoTriggerResponse\u0028\u0029",
+            "name": "toTriggerResponse",
             "summary": "",
-            "url": "classes/Nitric-Faas-Response.html#method_getHeaders"
+            "url": "classes/Nitric-Faas-Response.html#method_toTriggerResponse"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Response\u003A\u003AsetHeaders\u0028\u0029",
-            "name": "setHeaders",
+            "fqsen": "\\Nitric\\Faas\\Response\u003A\u003A\u0024context",
+            "name": "context",
             "summary": "",
-            "url": "classes/Nitric-Faas-Response.html#method_setHeaders"
+            "url": "classes/Nitric-Faas-Response.html#property_context"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Response\u003A\u003A__construct\u0028\u0029",
-            "name": "__construct",
-            "summary": "Response\u0020constructor.",
-            "url": "classes/Nitric-Faas-Response.html#method___construct"
+            "fqsen": "\\Nitric\\Faas\\Response\u003A\u003A\u0024data",
+            "name": "data",
+            "summary": "",
+            "url": "classes/Nitric-Faas-Response.html#property_data"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Response\u003A\u003A\u0024body",
-            "name": "body",
+            "fqsen": "\\Nitric\\Faas\\ResponseContext",
+            "name": "ResponseContext",
             "summary": "",
-            "url": "classes/Nitric-Faas-Response.html#property_body"
+            "url": "classes/Nitric-Faas-ResponseContext.html"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Response\u003A\u003A\u0024status",
-            "name": "status",
+            "fqsen": "\\Nitric\\Faas\\ResponseContext\u003A\u003AisHttp\u0028\u0029",
+            "name": "isHttp",
             "summary": "",
-            "url": "classes/Nitric-Faas-Response.html#property_status"
+            "url": "classes/Nitric-Faas-ResponseContext.html#method_isHttp"
         },                {
-            "fqsen": "\\Nitric\\Faas\\Response\u003A\u003A\u0024headers",
-            "name": "headers",
+            "fqsen": "\\Nitric\\Faas\\ResponseContext\u003A\u003AisTopic\u0028\u0029",
+            "name": "isTopic",
+            "summary": "",
+            "url": "classes/Nitric-Faas-ResponseContext.html#method_isTopic"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\ResponseContext\u003A\u003AasHttp\u0028\u0029",
+            "name": "asHttp",
+            "summary": "",
+            "url": "classes/Nitric-Faas-ResponseContext.html#method_asHttp"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\ResponseContext\u003A\u003AasTopic\u0028\u0029",
+            "name": "asTopic",
             "summary": "",
-            "url": "classes/Nitric-Faas-Response.html#property_headers"
+            "url": "classes/Nitric-Faas-ResponseContext.html#method_asTopic"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\ResponseContext\u003A\u003Ahttp\u0028\u0029",
+            "name": "http",
+            "summary": "",
+            "url": "classes/Nitric-Faas-ResponseContext.html#method_http"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\ResponseContext\u003A\u003Atopic\u0028\u0029",
+            "name": "topic",
+            "summary": "",
+            "url": "classes/Nitric-Faas-ResponseContext.html#method_topic"
         },                {
             "fqsen": "\\Nitric\\Faas\\SourceType",
             "name": "SourceType",
@@ -695,6 +725,46 @@ Search.appendIndex(
             "name": "UNKNOWN",
             "summary": "Unknown\u0020source\u0020type",
             "url": "classes/Nitric-Faas-SourceType.html#constant_UNKNOWN"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\TopicContext",
+            "name": "TopicContext",
+            "summary": "Class\u0020Context\u0020represents\u0020the\u0020metadata\u0020of\u0020a\u0020FaaS\u0020request",
+            "url": "classes/Nitric-Faas-TopicContext.html"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\TopicContext\u003A\u003A__construct\u0028\u0029",
+            "name": "__construct",
+            "summary": "",
+            "url": "classes/Nitric-Faas-TopicContext.html#method___construct"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\TopicContext\u003A\u003AgetTopic\u0028\u0029",
+            "name": "getTopic",
+            "summary": "",
+            "url": "classes/Nitric-Faas-TopicContext.html#method_getTopic"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\TopicContext\u003A\u003A\u0024topic",
+            "name": "topic",
+            "summary": "",
+            "url": "classes/Nitric-Faas-TopicContext.html#property_topic"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\TopicResponseContext",
+            "name": "TopicResponseContext",
+            "summary": "",
+            "url": "classes/Nitric-Faas-TopicResponseContext.html"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\TopicResponseContext\u003A\u003A__construct\u0028\u0029",
+            "name": "__construct",
+            "summary": "",
+            "url": "classes/Nitric-Faas-TopicResponseContext.html#method___construct"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\TopicResponseContext\u003A\u003AtoGrpcResponseContext\u0028\u0029",
+            "name": "toGrpcResponseContext",
+            "summary": "",
+            "url": "classes/Nitric-Faas-TopicResponseContext.html#method_toGrpcResponseContext"
+        },                {
+            "fqsen": "\\Nitric\\Faas\\TopicResponseContext\u003A\u003A\u0024success",
+            "name": "success",
+            "summary": "",
+            "url": "classes/Nitric-Faas-TopicResponseContext.html#property_success"
         },                {
             "fqsen": "\\",
             "name": "\\",
diff --git a/docs/namespaces/default.html b/docs/namespaces/default.html
index d7c2792..26c5160 100644
--- a/docs/namespaces/default.html
+++ b/docs/namespaces/default.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -131,5 +132,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/namespaces/nitric-api-exception.html b/docs/namespaces/nitric-api-exception.html
index 8edc6fa..af20f5a 100644
--- a/docs/namespaces/nitric-api-exception.html
+++ b/docs/namespaces/nitric-api-exception.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -164,5 +165,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/namespaces/nitric-api.html b/docs/namespaces/nitric-api.html
index fe25f5c..fd437b3 100644
--- a/docs/namespaces/nitric-api.html
+++ b/docs/namespaces/nitric-api.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -161,5 +162,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/namespaces/nitric-faas.html b/docs/namespaces/nitric-faas.html
index 0dad7c7..7eb6d7d 100644
--- a/docs/namespaces/nitric-faas.html
+++ b/docs/namespaces/nitric-faas.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -102,9 +103,13 @@ <h3 id="interfaces_class_traits">
 <dl class="phpdocumentor-table-of-contents">
     
             <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a></dt>
-        <dd>Class Context represents the metadata of a FaaS request, including the source, payload type, unique request Id, etc.</dd>
+        <dd>Class Context represents the metadata of a FaaS request</dd>
             <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-Faas.html"><abbr title="\Nitric\Faas\Faas">Faas</abbr></a></dt>
         <dd>Function-as-a-Service (Faas) class provides method that assist in writing Serverless Functions, using PHP.</dd>
+            <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a></dt>
+        <dd>Class Context represents the metadata of a FaaS request</dd>
+            <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a></dt>
+        <dd></dd>
             <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-Logger.html"><abbr title="\Nitric\Faas\Logger">Logger</abbr></a></dt>
         <dd>Class Logger provides a basic logger implementation, enabling the FaaS HTTP server to print to stdout.</dd>
             <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-Request.html"><abbr title="\Nitric\Faas\Request">Request</abbr></a></dt>
@@ -112,8 +117,14 @@ <h3 id="interfaces_class_traits">
             <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-Response.html"><abbr title="\Nitric\Faas\Response">Response</abbr></a></dt>
         <dd>Class Response represents a normalized response in the Nitric runtime. Will be converted to a specific response type
 such as an HTTP response, depending on runtime environment.</dd>
+            <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-ResponseContext.html"><abbr title="\Nitric\Faas\ResponseContext">ResponseContext</abbr></a></dt>
+        <dd></dd>
             <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-SourceType.html"><abbr title="\Nitric\Faas\SourceType">SourceType</abbr></a></dt>
         <dd>Class SourceType represents the source type of a request such as HTTP Requests and Subscription Events.</dd>
+            <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a></dt>
+        <dd>Class Context represents the metadata of a FaaS request</dd>
+            <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a></dt>
+        <dd></dd>
     
     </dl>
 
@@ -146,5 +157,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/namespaces/nitric.html b/docs/namespaces/nitric.html
index e2cf6f8..9fb59c8 100644
--- a/docs/namespaces/nitric.html
+++ b/docs/namespaces/nitric.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -132,5 +133,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/packages/Default.html b/docs/packages/Default.html
new file mode 100644
index 0000000..b2b0b2f
--- /dev/null
+++ b/docs/packages/Default.html
@@ -0,0 +1,148 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Documentation</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <base href="../">
+    <link rel="icon" href="images/favicon.ico"/>
+    <link rel="stylesheet" href="css/normalize.css">
+    <link rel="stylesheet" href="css/base.css">
+            <link rel="preconnect" href="https://fonts.gstatic.com">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:wght@400;600;700&display=swap" rel="stylesheet">
+        <link rel="stylesheet" href="css/template.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
+                <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
+        <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
+        <script src="js/search.js"></script>
+        <script defer src="js/searchIndex.js"></script>
+    </head>
+<body id="top">
+    <header class="phpdocumentor-header phpdocumentor-section">
+    <h1 class="phpdocumentor-title"><a href="" class="phpdocumentor-title__link">Documentation</a></h1>
+    <input class="phpdocumentor-header__menu-button" type="checkbox" id="menu-button" name="menu-button" />
+    <label class="phpdocumentor-header__menu-icon" for="menu-button">
+        <i class="fas fa-bars"></i>
+    </label>
+    <section data-search-form class="phpdocumentor-search">
+    <label>
+        <span class="visually-hidden">Search for</span>
+        <svg class="phpdocumentor-search__icon" width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <circle cx="7.5" cy="7.5" r="6.5" stroke="currentColor" stroke-width="2"/>
+            <line x1="12.4892" y1="12.2727" x2="19.1559" y2="18.9393" stroke="currentColor" stroke-width="3"/>
+        </svg>
+        <input type="search" class="phpdocumentor-field phpdocumentor-search__field" placeholder="Loading .." disabled />
+    </label>
+</section>
+
+    <nav class="phpdocumentor-topnav">
+    <ul class="phpdocumentor-topnav__menu">
+        </ul>
+</nav>
+</header>
+
+    <main class="phpdocumentor">
+        <div class="phpdocumentor-section">
+            <input class="phpdocumentor-sidebar__menu-button" type="checkbox" id="sidebar-button" name="sidebar-button" />
+<label class="phpdocumentor-sidebar__menu-icon" for="sidebar-button">
+    Menu
+</label>
+<aside class="phpdocumentor-column -four phpdocumentor-sidebar">
+        
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Namespaces</h2>
+                                                <h4 class="phpdocumentor-sidebar__root-namespace"><a href="namespaces/nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h4>
+                <ul class="phpdocumentor-list">
+                                            <li><a href="namespaces/nitric-api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                            <li><a href="namespaces/nitric-faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                                    </ul>
+                        </section>
+
+        <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Packages</h2>
+                    <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Default.html"><abbr title="\Default">Default</abbr></a></h3>
+                                <h3 class="phpdocumentor-sidebar__root-package"><a href="packages/Nitric.html"><abbr title="\Nitric">Nitric</abbr></a></h3>
+                        <ul class="phpdocumentor-list">
+                                    <li><a href="packages/Nitric-Api.html"><abbr title="\Nitric\Api">Api</abbr></a></li>
+                                    <li><a href="packages/Nitric-Faas.html"><abbr title="\Nitric\Faas">Faas</abbr></a></li>
+                            </ul>
+                        </section>
+    
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Reports</h2>
+                <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/deprecated.html">Deprecated</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/errors.html">Errors</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/markers.html">Markers</a></h3>
+    </section>
+
+    <section class="phpdocumentor-sidebar__category">
+        <h2 class="phpdocumentor-sidebar__category-header">Indices</h2>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="indices/files.html">Files</a></h3>
+    </section>
+</aside>
+
+            <div class="phpdocumentor-column -eight phpdocumentor-content">
+                    <ul class="phpdocumentor-breadcrumbs">
+    </ul>
+
+    <article class="phpdocumentor-element -package">
+        <h2 class="phpdocumentor-content__title">Default</h2>
+
+        
+
+<h3 id="interfaces_class_traits">
+    Interfaces, Classes and Traits
+    <a href="#interfaces_class_traits" class="headerlink"><i class="fas fa-link"></i></a>
+</h3>
+
+<dl class="phpdocumentor-table-of-contents">
+    
+            <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-HttpContext.html"><abbr title="\Nitric\Faas\HttpContext">HttpContext</abbr></a></dt>
+        <dd>Class Context represents the metadata of a FaaS request</dd>
+            <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-HttpResponseContext.html"><abbr title="\Nitric\Faas\HttpResponseContext">HttpResponseContext</abbr></a></dt>
+        <dd></dd>
+            <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-ResponseContext.html"><abbr title="\Nitric\Faas\ResponseContext">ResponseContext</abbr></a></dt>
+        <dd></dd>
+            <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-TopicContext.html"><abbr title="\Nitric\Faas\TopicContext">TopicContext</abbr></a></dt>
+        <dd>Class Context represents the metadata of a FaaS request</dd>
+            <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-TopicResponseContext.html"><abbr title="\Nitric\Faas\TopicResponseContext">TopicResponseContext</abbr></a></dt>
+        <dd></dd>
+    
+    </dl>
+
+
+
+        
+
+        
+    </article>
+                <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
+    <section class="phpdocumentor-search-results__dialog">
+        <header class="phpdocumentor-search-results__header">
+            <h2 class="phpdocumentor-search-results__title">Search results</h2>
+            <button class="phpdocumentor-search-results__close"><i class="fas fa-times"></i></button>
+        </header>
+        <section class="phpdocumentor-search-results__body">
+            <ul class="phpdocumentor-search-results__entries"></ul>
+        </section>
+    </section>
+</section>
+            </div>
+        </div>
+        <a href="packages/Default.html#top" class="phpdocumentor-back-to-top"><i class="fas fa-chevron-circle-up"></i></a>
+
+    </main>
+
+    <script>
+        cssVars({});
+    </script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
+</body>
+</html>
diff --git a/docs/packages/Nitric-Api-Exception.html b/docs/packages/Nitric-Api-Exception.html
index 21a3d34..3c2d1c8 100644
--- a/docs/packages/Nitric-Api-Exception.html
+++ b/docs/packages/Nitric-Api-Exception.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -164,5 +165,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/packages/Nitric-Api.html b/docs/packages/Nitric-Api.html
index 6419bb9..8d388f6 100644
--- a/docs/packages/Nitric-Api.html
+++ b/docs/packages/Nitric-Api.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -161,5 +162,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/packages/Nitric-Faas.html b/docs/packages/Nitric-Faas.html
index 2719da4..7c889ff 100644
--- a/docs/packages/Nitric-Faas.html
+++ b/docs/packages/Nitric-Faas.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -102,7 +103,7 @@ <h3 id="interfaces_class_traits">
 <dl class="phpdocumentor-table-of-contents">
     
             <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-Context.html"><abbr title="\Nitric\Faas\Context">Context</abbr></a></dt>
-        <dd>Class Context represents the metadata of a FaaS request, including the source, payload type, unique request Id, etc.</dd>
+        <dd>Class Context represents the metadata of a FaaS request</dd>
             <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-Faas.html"><abbr title="\Nitric\Faas\Faas">Faas</abbr></a></dt>
         <dd>Function-as-a-Service (Faas) class provides method that assist in writing Serverless Functions, using PHP.</dd>
             <dt class="phpdocumentor-table-of-contents__entry -class"><a href="classes/Nitric-Faas-Logger.html"><abbr title="\Nitric\Faas\Logger">Logger</abbr></a></dt>
@@ -146,5 +147,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/packages/Nitric.html b/docs/packages/Nitric.html
index 80895ff..9d17317 100644
--- a/docs/packages/Nitric.html
+++ b/docs/packages/Nitric.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -132,5 +133,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/packages/default.html b/docs/packages/default.html
index 605c7f6..889bb02 100644
--- a/docs/packages/default.html
+++ b/docs/packages/default.html
@@ -15,6 +15,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -89,9 +90,18 @@ <h3 class="phpdocumentor-sidebar__root-package"><a href="indices/files.html">Fil
     </ul>
 
     <article class="phpdocumentor-element -package">
-        <h2 class="phpdocumentor-content__title">Default</h2>
+        <h2 class="phpdocumentor-content__title">API Documentation</h2>
+
+        <h3 id="packages">
+    Packages
+    <a href="#packages" class="headerlink"><i class="fas fa-link"></i></a>
+</h3>
+
+<dl class="phpdocumentor-table-of-contents">
+            <dt class="phpdocumentor-table-of-contents__entry -package"><a href="packages/Default.html"><abbr title="\Default">Default</abbr></a></dt>
+            <dt class="phpdocumentor-table-of-contents__entry -package"><a href="packages/Nitric.html"><abbr title="\Nitric">Nitric</abbr></a></dt>
+    </dl>
 
-        
 
 
 
@@ -113,7 +123,7 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
 </section>
             </div>
         </div>
-        <a href="packages/Default.html#top" class="phpdocumentor-back-to-top"><i class="fas fa-chevron-circle-up"></i></a>
+        <a href="packages/default.html#top" class="phpdocumentor-back-to-top"><i class="fas fa-chevron-circle-up"></i></a>
 
     </main>
 
@@ -123,5 +133,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/reports/deprecated.html b/docs/reports/deprecated.html
index 1b8005c..db0b0a8 100644
--- a/docs/reports/deprecated.html
+++ b/docs/reports/deprecated.html
@@ -16,6 +16,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -121,5 +122,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/reports/errors.html b/docs/reports/errors.html
index 419e82d..2167bf3 100644
--- a/docs/reports/errors.html
+++ b/docs/reports/errors.html
@@ -16,6 +16,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -120,5 +121,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/docs/reports/markers.html b/docs/reports/markers.html
index 3a38ac2..fdaa814 100644
--- a/docs/reports/markers.html
+++ b/docs/reports/markers.html
@@ -16,6 +16,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0/css/all.min.css" integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-okaidia.css">
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.css">
                 <script src="https://cdn.jsdelivr.net/npm/fuse.js@3.4.6"></script>
         <script src="https://cdn.jsdelivr.net/npm/css-vars-ponyfill@2"></script>
         <script src="js/search.js"></script>
@@ -93,10 +94,932 @@ <h3 class="phpdocumentor-sidebar__root-package"><a href="indices/files.html">Fil
     <div class="phpdocumentor-row">
         <h2 class="phpdocumentor-content__title">Markers</h2>
 
-                    <div class="phpdocumentor-admonition phpdocumentor-admonition--success">
-                No markers have been found in this project.
-            </div>
+                    <h3>Table of Contents</h3>
+            <table class="phpdocumentor-table_of_contents">
+                                                            <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/AbstractClient.php">Nitric/Api/AbstractClient.php</a></td>
+                            <td class="phpdocumentor-cell">6</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/Event.php">Nitric/Api/Event.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/EventClient.php">Nitric/Api/EventClient.php</a></td>
+                            <td class="phpdocumentor-cell">3</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/Exception/AbortedException.php">Nitric/Api/Exception/AbortedException.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/Exception/AlreadyExistsException.php">Nitric/Api/Exception/AlreadyExistsException.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/Exception/CancelledException.php">Nitric/Api/Exception/CancelledException.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/Exception/DataLossException.php">Nitric/Api/Exception/DataLossException.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/Exception/DeadlineExceededException.php">Nitric/Api/Exception/DeadlineExceededException.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/Exception/FailedPreconditionException.php">Nitric/Api/Exception/FailedPreconditionException.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/Exception/InternalException.php">Nitric/Api/Exception/InternalException.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/Exception/InvalidArgumentException.php">Nitric/Api/Exception/InvalidArgumentException.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/Exception/NotFoundException.php">Nitric/Api/Exception/NotFoundException.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/Exception/OutOfRangeException.php">Nitric/Api/Exception/OutOfRangeException.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/Exception/PermissionDeniedException.php">Nitric/Api/Exception/PermissionDeniedException.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/Exception/ResourceExhaustedException.php">Nitric/Api/Exception/ResourceExhaustedException.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/Exception/UnauthenticatedException.php">Nitric/Api/Exception/UnauthenticatedException.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/Exception/UnavailableException.php">Nitric/Api/Exception/UnavailableException.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/Exception/UnimplementedException.php">Nitric/Api/Exception/UnimplementedException.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/FailedTask.php">Nitric/Api/FailedTask.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/KeyValueClient.php">Nitric/Api/KeyValueClient.php</a></td>
+                            <td class="phpdocumentor-cell">2</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/QueueClient.php">Nitric/Api/QueueClient.php</a></td>
+                            <td class="phpdocumentor-cell">2</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/StorageClient.php">Nitric/Api/StorageClient.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/Task.php">Nitric/Api/Task.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/TopicClient.php">Nitric/Api/TopicClient.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Api/UserClient.php">Nitric/Api/UserClient.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Faas/Context.php">Nitric/Faas/Context.php</a></td>
+                            <td class="phpdocumentor-cell">3</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Faas/Faas.php">Nitric/Faas/Faas.php</a></td>
+                            <td class="phpdocumentor-cell">16</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Faas/HttpContext.php">Nitric/Faas/HttpContext.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Faas/HttpResponseContext.php">Nitric/Faas/HttpResponseContext.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Faas/Logger.php">Nitric/Faas/Logger.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Faas/Request.php">Nitric/Faas/Request.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Faas/Response.php">Nitric/Faas/Response.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Faas/ResponseContext.php">Nitric/Faas/ResponseContext.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Faas/SourceType.php">Nitric/Faas/SourceType.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Faas/TopicContext.php">Nitric/Faas/TopicContext.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                                                <tr>
+                            <td class="phpdocumentor-cell"><a href="reports/markers.html#Nitric/Faas/TopicResponseContext.php">Nitric/Faas/TopicResponseContext.php</a></td>
+                            <td class="phpdocumentor-cell">1</td>
+                        </tr>
+                                                </table>
         
+                    <a id="Nitric/Api/AbstractClient.php"></a>
+            <h3><abbr title="Nitric/Api/AbstractClient.php">AbstractClient.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">72</td>
+                        <td class="phpdocumentor-cell">Retrieve the Nitric service address, defaulting to the standard local ip and port.</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">111</td>
+                        <td class="phpdocumentor-cell">No exceptions or details in the of a successful response status.</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">115</td>
+                        <td class="phpdocumentor-cell">Set a default error message, details aren&#039;t always provided in the status.</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">118</td>
+                        <td class="phpdocumentor-cell">Construct and throw the appropriate exception for each status</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">135</td>
+                        <td class="phpdocumentor-cell">Includes STATUS_UNKNOWN</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/Event.php"></a>
+            <h3><abbr title="Nitric/Api/Event.php">Event.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/EventClient.php"></a>
+            <h3><abbr title="Nitric/Api/EventClient.php">EventClient.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">33</td>
+                        <td class="phpdocumentor-cell">www.opensource.org/licenses/mit-license.html  MIT License</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">34</td>
+                        <td class="phpdocumentor-cell">nitric.io</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/Exception/AbortedException.php"></a>
+            <h3><abbr title="Nitric/Api/Exception/AbortedException.php">AbortedException.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/Exception/AlreadyExistsException.php"></a>
+            <h3><abbr title="Nitric/Api/Exception/AlreadyExistsException.php">AlreadyExistsException.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/Exception/CancelledException.php"></a>
+            <h3><abbr title="Nitric/Api/Exception/CancelledException.php">CancelledException.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/Exception/DataLossException.php"></a>
+            <h3><abbr title="Nitric/Api/Exception/DataLossException.php">DataLossException.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/Exception/DeadlineExceededException.php"></a>
+            <h3><abbr title="Nitric/Api/Exception/DeadlineExceededException.php">DeadlineExceededException.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/Exception/FailedPreconditionException.php"></a>
+            <h3><abbr title="Nitric/Api/Exception/FailedPreconditionException.php">FailedPreconditionException.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/Exception/InternalException.php"></a>
+            <h3><abbr title="Nitric/Api/Exception/InternalException.php">InternalException.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/Exception/InvalidArgumentException.php"></a>
+            <h3><abbr title="Nitric/Api/Exception/InvalidArgumentException.php">InvalidArgumentException.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/Exception/NotFoundException.php"></a>
+            <h3><abbr title="Nitric/Api/Exception/NotFoundException.php">NotFoundException.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/Exception/OutOfRangeException.php"></a>
+            <h3><abbr title="Nitric/Api/Exception/OutOfRangeException.php">OutOfRangeException.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/Exception/PermissionDeniedException.php"></a>
+            <h3><abbr title="Nitric/Api/Exception/PermissionDeniedException.php">PermissionDeniedException.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/Exception/ResourceExhaustedException.php"></a>
+            <h3><abbr title="Nitric/Api/Exception/ResourceExhaustedException.php">ResourceExhaustedException.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/Exception/UnauthenticatedException.php"></a>
+            <h3><abbr title="Nitric/Api/Exception/UnauthenticatedException.php">UnauthenticatedException.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/Exception/UnavailableException.php"></a>
+            <h3><abbr title="Nitric/Api/Exception/UnavailableException.php">UnavailableException.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/Exception/UnimplementedException.php"></a>
+            <h3><abbr title="Nitric/Api/Exception/UnimplementedException.php">UnimplementedException.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/FailedTask.php"></a>
+            <h3><abbr title="Nitric/Api/FailedTask.php">FailedTask.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/KeyValueClient.php"></a>
+            <h3><abbr title="Nitric/Api/KeyValueClient.php">KeyValueClient.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">89</td>
+                        <td class="phpdocumentor-cell">Add type hint to the response object</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/QueueClient.php"></a>
+            <h3><abbr title="Nitric/Api/QueueClient.php">QueueClient.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">115</td>
+                        <td class="phpdocumentor-cell">Add type hint to the response object</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/StorageClient.php"></a>
+            <h3><abbr title="Nitric/Api/StorageClient.php">StorageClient.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/Task.php"></a>
+            <h3><abbr title="Nitric/Api/Task.php">Task.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/TopicClient.php"></a>
+            <h3><abbr title="Nitric/Api/TopicClient.php">TopicClient.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Api/UserClient.php"></a>
+            <h3><abbr title="Nitric/Api/UserClient.php">UserClient.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Faas/Context.php"></a>
+            <h3><abbr title="Nitric/Faas/Context.php">Context.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">56</td>
+                        <td class="phpdocumentor-cell">Throw exception</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">68</td>
+                        <td class="phpdocumentor-cell">Throw exception</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Faas/Faas.php"></a>
+            <h3><abbr title="Nitric/Faas/Faas.php">Faas.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">58</td>
+                        <td class="phpdocumentor-cell">TODO: Set credentials here...</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">62</td>
+                        <td class="phpdocumentor-cell">Write the InitRequest to connect</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">73</td>
+                        <td class="phpdocumentor-cell">Cancel the gRPC stream</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">79</td>
+                        <td class="phpdocumentor-cell">print(&quot;\nstarting read!\n&quot;);</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">81</td>
+                        <td class="phpdocumentor-cell">print(&quot;\nGot request:\n&quot;);</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">82</td>
+                        <td class="phpdocumentor-cell">print($readResult-&gt;serializeToJsonString());</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">90</td>
+                        <td class="phpdocumentor-cell">We&#039;re one with the membrane</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">91</td>
+                        <td class="phpdocumentor-cell">continue the loop and do nothing</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">94</td>
+                        <td class="phpdocumentor-cell">handle the trigger request</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">98</td>
+                        <td class="phpdocumentor-cell">Handle the userspace function</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">104</td>
+                        <td class="phpdocumentor-cell">Assume its a string</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">107</td>
+                        <td class="phpdocumentor-cell">Assume its a string</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">121</td>
+                        <td class="phpdocumentor-cell">yield $emit(&quot;.&quot;);</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">123</td>
+                        <td class="phpdocumentor-cell">Invalid message recieved</td>
+                    </tr>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">130</td>
+                        <td class="phpdocumentor-cell">print(&quot;Exited loop :( \n&quot;);</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Faas/HttpContext.php"></a>
+            <h3><abbr title="Nitric/Faas/HttpContext.php">HttpContext.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Faas/HttpResponseContext.php"></a>
+            <h3><abbr title="Nitric/Faas/HttpResponseContext.php">HttpResponseContext.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Faas/Logger.php"></a>
+            <h3><abbr title="Nitric/Faas/Logger.php">Logger.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Faas/Request.php"></a>
+            <h3><abbr title="Nitric/Faas/Request.php">Request.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Faas/Response.php"></a>
+            <h3><abbr title="Nitric/Faas/Response.php">Response.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Faas/ResponseContext.php"></a>
+            <h3><abbr title="Nitric/Faas/ResponseContext.php">ResponseContext.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Faas/SourceType.php"></a>
+            <h3><abbr title="Nitric/Faas/SourceType.php">SourceType.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Faas/TopicContext.php"></a>
+            <h3><abbr title="Nitric/Faas/TopicContext.php">TopicContext.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
+                    <a id="Nitric/Faas/TopicResponseContext.php"></a>
+            <h3><abbr title="Nitric/Faas/TopicResponseContext.php">TopicResponseContext.php</abbr></h3>
+            <table>
+                <thead>
+                <tr>
+                    <th class="phpdocumentor-heading">Type</th>
+                    <th class="phpdocumentor-heading">Line</th>
+                    <th class="phpdocumentor-heading">Description</th>
+                </tr>
+                </thead>
+                <tbody>
+                                    <tr>
+                        <td class="phpdocumentor-cell"></td>
+                        <td class="phpdocumentor-cell">10</td>
+                        <td class="phpdocumentor-cell">www.apache.org/licenses/LICENSE-2.0</td>
+                    </tr>
+                                </tbody>
+            </table>
             </div>
                 <section data-search-results class="phpdocumentor-search-results phpdocumentor-search-results--hidden">
     <section class="phpdocumentor-search-results__dialog">
@@ -121,5 +1044,6 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/prism.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/line-highlight/prism-line-highlight.min.js"></script>
 </body>
 </html>
diff --git a/interfaces/GPBMetadata/Auth/V1/Auth.php b/interfaces/GPBMetadata/Auth/V1/Auth.php
new file mode 100644
index 0000000..3047952
--- /dev/null
+++ b/interfaces/GPBMetadata/Auth/V1/Auth.php
@@ -0,0 +1,36 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: auth/v1/auth.proto
+
+namespace GPBMetadata\Auth\V1;
+
+class Auth
+{
+    public static $is_initialized = false;
+
+    public static function initOnce() {
+        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
+
+        if (static::$is_initialized == true) {
+          return;
+        }
+        $pool->internalAddGeneratedFile(
+            '
+Í
+auth/v1/auth.protonitric.auth.v1"P
+UserCreateRequest
+tenant
 
(	
+
+id 
(	
+email 
(	
+password 
(	"
+UserCreateResponse2W
+UserO
+Create!.nitric.auth.v1.UserCreateRequest".nitric.auth.v1.UserCreateResponseB^
+io.nitric.proto.auth.v1BAuthsP
Znitric/v1;v1ªNitric.Proto.Auth.v1ÊNitric\\Proto\\Auth\\V1bproto3'
+        , true);
+
+        static::$is_initialized = true;
+    }
+}
+
diff --git a/interfaces/GPBMetadata/Event/V1/Event.php b/interfaces/GPBMetadata/Event/V1/Event.php
new file mode 100644
index 0000000..8a84f5a
--- /dev/null
+++ b/interfaces/GPBMetadata/Event/V1/Event.php
@@ -0,0 +1,48 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: event/v1/event.proto
+
+namespace GPBMetadata\Event\V1;
+
+class Event
+{
+    public static $is_initialized = false;
+
+    public static function initOnce() {
+        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
+
+        if (static::$is_initialized == true) {
+          return;
+        }
+        \GPBMetadata\Google\Protobuf\Struct::initOnce();
+        $pool->internalAddGeneratedFile(
+            '
+‘
+event/v1/event.protonitric.event.v1"Q
+EventPublishRequest
+topic
 
(	+
+event 
(2.nitric.event.v1.NitricEvent""
+EventPublishResponse
+
+id
 
(	"
+TopicListRequest"A
+TopicListResponse,
+topics
 (2.nitric.event.v1.NitricTopic"
+NitricTopic
+name
 
(	"X
+NitricEvent
+
+id
 
(	
+payloadType 
(	(
+payload 
(2.google.protobuf.Struct2_
+EventV
+Publish$.nitric.event.v1.EventPublishRequest%.nitric.event.v1.EventPublishResponse2V
+TopicM
+List!.nitric.event.v1.TopicListRequest".nitric.event.v1.TopicListResponseBb
+io.nitric.proto.event.v1BEventsP
Znitric/v1;v1ªNitric.Proto.Event.v1ÊNitric\\Proto\\Event\\V1bproto3'
+        , true);
+
+        static::$is_initialized = true;
+    }
+}
+
diff --git a/interfaces/GPBMetadata/Faas/V1/Faas.php b/interfaces/GPBMetadata/Faas/V1/Faas.php
new file mode 100644
index 0000000..c5012db
Binary files /dev/null and b/interfaces/GPBMetadata/Faas/V1/Faas.php differ
diff --git a/interfaces/GPBMetadata/Kv/V1/Kv.php b/interfaces/GPBMetadata/Kv/V1/Kv.php
new file mode 100644
index 0000000..af83a3a
--- /dev/null
+++ b/interfaces/GPBMetadata/Kv/V1/Kv.php
@@ -0,0 +1,49 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: kv/v1/kv.proto
+
+namespace GPBMetadata\Kv\V1;
+
+class Kv
+{
+    public static $is_initialized = false;
+
+    public static function initOnce() {
+        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
+
+        if (static::$is_initialized == true) {
+          return;
+        }
+        \GPBMetadata\Google\Protobuf\Struct::initOnce();
+        $pool->internalAddGeneratedFile(
+            '
+Ê
+kv/v1/kv.protonitric.kv.v1"5
+KeyValueGetRequest
+
+collection
 
(	
+key 
(	"=
+KeyValueGetResponse&
+value
 
(2.google.protobuf.Struct"]
+KeyValuePutRequest
+
+collection
 
(	
+key 
(	&
+value 
(2.google.protobuf.Struct"
+KeyValuePutResponse"8
+KeyValueDeleteRequest
+
+collection
 
(	
+key 
(	"
+KeyValueDeleteResponse2÷

+KeyValueJ
+Get .nitric.kv.v1.KeyValueGetRequest!.nitric.kv.v1.KeyValueGetResponseJ
+Put .nitric.kv.v1.KeyValuePutRequest!.nitric.kv.v1.KeyValuePutResponseS
+Delete#.nitric.kv.v1.KeyValueDeleteRequest$.nitric.kv.v1.KeyValueDeleteResponseBh
+io.nitric.proto.kv.v1B	KeyValuesP
Znitric/v1;v1ªNitric.Proto.KeyValue.v1ÊNitric\\Proto\\KeyValue\\V1bproto3'
+        , true);
+
+        static::$is_initialized = true;
+    }
+}
+
diff --git a/interfaces/GPBMetadata/Queue/V1/Queue.php b/interfaces/GPBMetadata/Queue/V1/Queue.php
new file mode 100644
index 0000000..64ecf11
--- /dev/null
+++ b/interfaces/GPBMetadata/Queue/V1/Queue.php
@@ -0,0 +1,62 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: queue/v1/queue.proto
+
+namespace GPBMetadata\Queue\V1;
+
+class Queue
+{
+    public static $is_initialized = false;
+
+    public static function initOnce() {
+        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
+
+        if (static::$is_initialized == true) {
+          return;
+        }
+        \GPBMetadata\Google\Protobuf\Struct::initOnce();
+        $pool->internalAddGeneratedFile(
+            '
+þ
+queue/v1/queue.protonitric.queue.v1"L
+QueueSendRequest
+queue
 
(	)
+task 
(2.nitric.queue.v1.NitricTask"
+QueueSendResponse"R
+QueueSendBatchRequest
+queue
 
(	*
+tasks (2.nitric.queue.v1.NitricTask"J
+QueueSendBatchResponse0
+failedTasks
 (2.nitric.queue.v1.FailedTask"3
+QueueReceiveRequest
+queue
 
(	
+depth 
("B
+QueueReceiveResponse*
+tasks
 (2.nitric.queue.v1.NitricTask"6
+QueueCompleteRequest
+queue
 
(	
+leaseId 
(	"
+QueueCompleteResponse"H
+
+FailedTask)
+task
 
(2.nitric.queue.v1.NitricTask
+message 
(	"h
+
+NitricTask
+
+id
 
(	
+leaseId 
(	
+payloadType 
(	(
+payload 
(2.google.protobuf.Struct2ç
+QueueM
+Send!.nitric.queue.v1.QueueSendRequest".nitric.queue.v1.QueueSendResponse\\
+	SendBatch&.nitric.queue.v1.QueueSendBatchRequest\'.nitric.queue.v1.QueueSendBatchResponseV
+Receive$.nitric.queue.v1.QueueReceiveRequest%.nitric.queue.v1.QueueReceiveResponseY
+Complete%.nitric.queue.v1.QueueCompleteRequest&.nitric.queue.v1.QueueCompleteResponseBb
+io.nitric.proto.queue.v1BQueuesP
Znitric/v1;v1ªNitric.Proto.Queue.v1ÊNitric\\Proto\\Queue\\V1bproto3'
+        , true);
+
+        static::$is_initialized = true;
+    }
+}
+
diff --git a/interfaces/GPBMetadata/Storage/V1/Storage.php b/interfaces/GPBMetadata/Storage/V1/Storage.php
new file mode 100644
index 0000000..49d56bc
--- /dev/null
+++ b/interfaces/GPBMetadata/Storage/V1/Storage.php
@@ -0,0 +1,48 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: storage/v1/storage.proto
+
+namespace GPBMetadata\Storage\V1;
+
+class Storage
+{
+    public static $is_initialized = false;
+
+    public static function initOnce() {
+        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
+
+        if (static::$is_initialized == true) {
+          return;
+        }
+        $pool->internalAddGeneratedFile(
+            '
+Ç
+storage/v1/storage.protonitric.storage.v1"D
+StorageWriteRequest
+
+bucketName
 
(	
+key 
(	
+body 
("
+StorageWriteResponse"5
+StorageReadRequest
+
+bucketName
 
(	
+key 
(	"#
+StorageReadResponse
+body
 
("7
+StorageDeleteRequest
+
+bucketName
 
(	
+key 
(	"
+StorageDeleteResponse2—
+StorageU
+Read%.nitric.storage.v1.StorageReadRequest&.nitric.storage.v1.StorageReadResponseX
+Write&.nitric.storage.v1.StorageWriteRequest\'.nitric.storage.v1.StorageWriteResponse[
+Delete\'.nitric.storage.v1.StorageDeleteRequest(.nitric.storage.v1.StorageDeleteResponseBj
+io.nitric.proto.storage.v1BStoragesP
Znitric/v1;v1ªNitric.Proto.Storage.v1ÊNitric\\Proto\\Storage\\V1bproto3'
+        , true);
+
+        static::$is_initialized = true;
+    }
+}
+
diff --git a/interfaces/Nitric/Proto/Auth/V1/UserClient.php b/interfaces/Nitric/Proto/Auth/V1/UserClient.php
new file mode 100644
index 0000000..afe02a6
--- /dev/null
+++ b/interfaces/Nitric/Proto/Auth/V1/UserClient.php
@@ -0,0 +1,35 @@
+<?php
+// GENERATED CODE -- DO NOT EDIT!
+
+namespace Nitric\Proto\Auth\V1;
+
+/**
+ * Service for user management activities, such as creating and deleting users
+ */
+class UserClient extends \Grpc\BaseStub {
+
+    /**
+     * @param string $hostname hostname
+     * @param array $opts channel options
+     * @param \Grpc\Channel $channel (optional) re-use channel object
+     */
+    public function __construct($hostname, $opts, $channel = null) {
+        parent::__construct($hostname, $opts, $channel);
+    }
+
+    /**
+     * Create a new user in a tenant
+     * @param \Nitric\Proto\Auth\V1\UserCreateRequest $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function Create(\Nitric\Proto\Auth\V1\UserCreateRequest $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/nitric.auth.v1.User/Create',
+        $argument,
+        ['\Nitric\Proto\Auth\V1\UserCreateResponse', 'decode'],
+        $metadata, $options);
+    }
+
+}
diff --git a/interfaces/Nitric/Proto/Auth/V1/UserCreateRequest.php b/interfaces/Nitric/Proto/Auth/V1/UserCreateRequest.php
new file mode 100644
index 0000000..ab3f48a
--- /dev/null
+++ b/interfaces/Nitric/Proto/Auth/V1/UserCreateRequest.php
@@ -0,0 +1,141 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: auth/v1/auth.proto
+
+namespace Nitric\Proto\Auth\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Request to create a new user in the given tenant (user pool).
+ *
+ * Generated from protobuf message <code>nitric.auth.v1.UserCreateRequest</code>
+ */
+class UserCreateRequest extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * Generated from protobuf field <code>string tenant = 1;</code>
+     */
+    protected $tenant = '';
+    /**
+     * Generated from protobuf field <code>string id = 2;</code>
+     */
+    protected $id = '';
+    /**
+     * Generated from protobuf field <code>string email = 3;</code>
+     */
+    protected $email = '';
+    /**
+     * Generated from protobuf field <code>string password = 4;</code>
+     */
+    protected $password = '';
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $tenant
+     *     @type string $id
+     *     @type string $email
+     *     @type string $password
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Auth\V1\Auth::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * Generated from protobuf field <code>string tenant = 1;</code>
+     * @return string
+     */
+    public function getTenant()
+    {
+        return $this->tenant;
+    }
+
+    /**
+     * Generated from protobuf field <code>string tenant = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setTenant($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->tenant = $var;
+
+        return $this;
+    }
+
+    /**
+     * Generated from protobuf field <code>string id = 2;</code>
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Generated from protobuf field <code>string id = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setId($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->id = $var;
+
+        return $this;
+    }
+
+    /**
+     * Generated from protobuf field <code>string email = 3;</code>
+     * @return string
+     */
+    public function getEmail()
+    {
+        return $this->email;
+    }
+
+    /**
+     * Generated from protobuf field <code>string email = 3;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setEmail($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->email = $var;
+
+        return $this;
+    }
+
+    /**
+     * Generated from protobuf field <code>string password = 4;</code>
+     * @return string
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+
+    /**
+     * Generated from protobuf field <code>string password = 4;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setPassword($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->password = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Auth/V1/UserCreateResponse.php b/interfaces/Nitric/Proto/Auth/V1/UserCreateResponse.php
new file mode 100644
index 0000000..5a982a2
--- /dev/null
+++ b/interfaces/Nitric/Proto/Auth/V1/UserCreateResponse.php
@@ -0,0 +1,33 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: auth/v1/auth.proto
+
+namespace Nitric\Proto\Auth\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Successful create requests provide no response currently.
+ *
+ * Generated from protobuf message <code>nitric.auth.v1.UserCreateResponse</code>
+ */
+class UserCreateResponse extends \Google\Protobuf\Internal\Message
+{
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Auth\V1\Auth::initOnce();
+        parent::__construct($data);
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Event/V1/EventClient.php b/interfaces/Nitric/Proto/Event/V1/EventClient.php
new file mode 100644
index 0000000..5437add
--- /dev/null
+++ b/interfaces/Nitric/Proto/Event/V1/EventClient.php
@@ -0,0 +1,35 @@
+<?php
+// GENERATED CODE -- DO NOT EDIT!
+
+namespace Nitric\Proto\Event\V1;
+
+/**
+ * Service for publishing asynchronous event
+ */
+class EventClient extends \Grpc\BaseStub {
+
+    /**
+     * @param string $hostname hostname
+     * @param array $opts channel options
+     * @param \Grpc\Channel $channel (optional) re-use channel object
+     */
+    public function __construct($hostname, $opts, $channel = null) {
+        parent::__construct($hostname, $opts, $channel);
+    }
+
+    /**
+     * Publishes an message to a given topic
+     * @param \Nitric\Proto\Event\V1\EventPublishRequest $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function Publish(\Nitric\Proto\Event\V1\EventPublishRequest $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/nitric.event.v1.Event/Publish',
+        $argument,
+        ['\Nitric\Proto\Event\V1\EventPublishResponse', 'decode'],
+        $metadata, $options);
+    }
+
+}
diff --git a/interfaces/Nitric/Proto/Event/V1/EventPublishRequest.php b/interfaces/Nitric/Proto/Event/V1/EventPublishRequest.php
new file mode 100644
index 0000000..e070c0a
--- /dev/null
+++ b/interfaces/Nitric/Proto/Event/V1/EventPublishRequest.php
@@ -0,0 +1,111 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: event/v1/event.proto
+
+namespace Nitric\Proto\Event\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Request to publish an event to a topic
+ *
+ * Generated from protobuf message <code>nitric.event.v1.EventPublishRequest</code>
+ */
+class EventPublishRequest extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The name of the topic to publish the event to
+     *
+     * Generated from protobuf field <code>string topic = 1;</code>
+     */
+    protected $topic = '';
+    /**
+     * The event to be published
+     *
+     * Generated from protobuf field <code>.nitric.event.v1.NitricEvent event = 2;</code>
+     */
+    protected $event = null;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $topic
+     *           The name of the topic to publish the event to
+     *     @type \Nitric\Proto\Event\V1\NitricEvent $event
+     *           The event to be published
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Event\V1\Event::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The name of the topic to publish the event to
+     *
+     * Generated from protobuf field <code>string topic = 1;</code>
+     * @return string
+     */
+    public function getTopic()
+    {
+        return $this->topic;
+    }
+
+    /**
+     * The name of the topic to publish the event to
+     *
+     * Generated from protobuf field <code>string topic = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setTopic($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->topic = $var;
+
+        return $this;
+    }
+
+    /**
+     * The event to be published
+     *
+     * Generated from protobuf field <code>.nitric.event.v1.NitricEvent event = 2;</code>
+     * @return \Nitric\Proto\Event\V1\NitricEvent|null
+     */
+    public function getEvent()
+    {
+        return isset($this->event) ? $this->event : null;
+    }
+
+    public function hasEvent()
+    {
+        return isset($this->event);
+    }
+
+    public function clearEvent()
+    {
+        unset($this->event);
+    }
+
+    /**
+     * The event to be published
+     *
+     * Generated from protobuf field <code>.nitric.event.v1.NitricEvent event = 2;</code>
+     * @param \Nitric\Proto\Event\V1\NitricEvent $var
+     * @return $this
+     */
+    public function setEvent($var)
+    {
+        GPBUtil::checkMessage($var, \Nitric\Proto\Event\V1\NitricEvent::class);
+        $this->event = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Event/V1/EventPublishResponse.php b/interfaces/Nitric/Proto/Event/V1/EventPublishResponse.php
new file mode 100644
index 0000000..df8591b
--- /dev/null
+++ b/interfaces/Nitric/Proto/Event/V1/EventPublishResponse.php
@@ -0,0 +1,75 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: event/v1/event.proto
+
+namespace Nitric\Proto\Event\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Result of publishing an event
+ *
+ * Generated from protobuf message <code>nitric.event.v1.EventPublishResponse</code>
+ */
+class EventPublishResponse extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The id of the published message
+     * When an id was not supplied
+     * one should be automatically generated
+     *
+     * Generated from protobuf field <code>string id = 1;</code>
+     */
+    protected $id = '';
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $id
+     *           The id of the published message
+     *           When an id was not supplied
+     *           one should be automatically generated
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Event\V1\Event::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The id of the published message
+     * When an id was not supplied
+     * one should be automatically generated
+     *
+     * Generated from protobuf field <code>string id = 1;</code>
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * The id of the published message
+     * When an id was not supplied
+     * one should be automatically generated
+     *
+     * Generated from protobuf field <code>string id = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setId($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->id = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Event/V1/NitricEvent.php b/interfaces/Nitric/Proto/Event/V1/NitricEvent.php
new file mode 100644
index 0000000..8fdc85a
--- /dev/null
+++ b/interfaces/Nitric/Proto/Event/V1/NitricEvent.php
@@ -0,0 +1,145 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: event/v1/event.proto
+
+namespace Nitric\Proto\Event\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Nitric Event Model
+ *
+ * Generated from protobuf message <code>nitric.event.v1.NitricEvent</code>
+ */
+class NitricEvent extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * A Unique ID for the Nitric Event
+     *
+     * Generated from protobuf field <code>string id = 1;</code>
+     */
+    protected $id = '';
+    /**
+     * A content hint for the events payload
+     *
+     * Generated from protobuf field <code>string payloadType = 2;</code>
+     */
+    protected $payloadType = '';
+    /**
+     * The payload of the event
+     *
+     * Generated from protobuf field <code>.google.protobuf.Struct payload = 3;</code>
+     */
+    protected $payload = null;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $id
+     *           A Unique ID for the Nitric Event
+     *     @type string $payloadType
+     *           A content hint for the events payload
+     *     @type \Google\Protobuf\Struct $payload
+     *           The payload of the event
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Event\V1\Event::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * A Unique ID for the Nitric Event
+     *
+     * Generated from protobuf field <code>string id = 1;</code>
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * A Unique ID for the Nitric Event
+     *
+     * Generated from protobuf field <code>string id = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setId($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->id = $var;
+
+        return $this;
+    }
+
+    /**
+     * A content hint for the events payload
+     *
+     * Generated from protobuf field <code>string payloadType = 2;</code>
+     * @return string
+     */
+    public function getPayloadType()
+    {
+        return $this->payloadType;
+    }
+
+    /**
+     * A content hint for the events payload
+     *
+     * Generated from protobuf field <code>string payloadType = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setPayloadType($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->payloadType = $var;
+
+        return $this;
+    }
+
+    /**
+     * The payload of the event
+     *
+     * Generated from protobuf field <code>.google.protobuf.Struct payload = 3;</code>
+     * @return \Google\Protobuf\Struct|null
+     */
+    public function getPayload()
+    {
+        return isset($this->payload) ? $this->payload : null;
+    }
+
+    public function hasPayload()
+    {
+        return isset($this->payload);
+    }
+
+    public function clearPayload()
+    {
+        unset($this->payload);
+    }
+
+    /**
+     * The payload of the event
+     *
+     * Generated from protobuf field <code>.google.protobuf.Struct payload = 3;</code>
+     * @param \Google\Protobuf\Struct $var
+     * @return $this
+     */
+    public function setPayload($var)
+    {
+        GPBUtil::checkMessage($var, \Google\Protobuf\Struct::class);
+        $this->payload = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Event/V1/NitricTopic.php b/interfaces/Nitric/Proto/Event/V1/NitricTopic.php
new file mode 100644
index 0000000..2686c9c
--- /dev/null
+++ b/interfaces/Nitric/Proto/Event/V1/NitricTopic.php
@@ -0,0 +1,67 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: event/v1/event.proto
+
+namespace Nitric\Proto\Event\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Represents an event topic
+ *
+ * Generated from protobuf message <code>nitric.event.v1.NitricTopic</code>
+ */
+class NitricTopic extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The Nitric name for the topic
+     *
+     * Generated from protobuf field <code>string name = 1;</code>
+     */
+    protected $name = '';
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $name
+     *           The Nitric name for the topic
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Event\V1\Event::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The Nitric name for the topic
+     *
+     * Generated from protobuf field <code>string name = 1;</code>
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * The Nitric name for the topic
+     *
+     * Generated from protobuf field <code>string name = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setName($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->name = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Event/V1/TopicClient.php b/interfaces/Nitric/Proto/Event/V1/TopicClient.php
new file mode 100644
index 0000000..de3ae62
--- /dev/null
+++ b/interfaces/Nitric/Proto/Event/V1/TopicClient.php
@@ -0,0 +1,35 @@
+<?php
+// GENERATED CODE -- DO NOT EDIT!
+
+namespace Nitric\Proto\Event\V1;
+
+/**
+ * Service for management of event topics
+ */
+class TopicClient extends \Grpc\BaseStub {
+
+    /**
+     * @param string $hostname hostname
+     * @param array $opts channel options
+     * @param \Grpc\Channel $channel (optional) re-use channel object
+     */
+    public function __construct($hostname, $opts, $channel = null) {
+        parent::__construct($hostname, $opts, $channel);
+    }
+
+    /**
+     * Return a list of existing topics in the provider environment
+     * @param \Nitric\Proto\Event\V1\TopicListRequest $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function List(\Nitric\Proto\Event\V1\TopicListRequest $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/nitric.event.v1.Topic/List',
+        $argument,
+        ['\Nitric\Proto\Event\V1\TopicListResponse', 'decode'],
+        $metadata, $options);
+    }
+
+}
diff --git a/interfaces/Nitric/Proto/Event/V1/TopicListRequest.php b/interfaces/Nitric/Proto/Event/V1/TopicListRequest.php
new file mode 100644
index 0000000..f27cd23
--- /dev/null
+++ b/interfaces/Nitric/Proto/Event/V1/TopicListRequest.php
@@ -0,0 +1,33 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: event/v1/event.proto
+
+namespace Nitric\Proto\Event\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Request for the Topic List method
+ *
+ * Generated from protobuf message <code>nitric.event.v1.TopicListRequest</code>
+ */
+class TopicListRequest extends \Google\Protobuf\Internal\Message
+{
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Event\V1\Event::initOnce();
+        parent::__construct($data);
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Event/V1/TopicListResponse.php b/interfaces/Nitric/Proto/Event/V1/TopicListResponse.php
new file mode 100644
index 0000000..a4d22b3
--- /dev/null
+++ b/interfaces/Nitric/Proto/Event/V1/TopicListResponse.php
@@ -0,0 +1,67 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: event/v1/event.proto
+
+namespace Nitric\Proto\Event\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Topic List Response
+ *
+ * Generated from protobuf message <code>nitric.event.v1.TopicListResponse</code>
+ */
+class TopicListResponse extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The list of found topics
+     *
+     * Generated from protobuf field <code>repeated .nitric.event.v1.NitricTopic topics = 1;</code>
+     */
+    private $topics;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type \Nitric\Proto\Event\V1\NitricTopic[]|\Google\Protobuf\Internal\RepeatedField $topics
+     *           The list of found topics
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Event\V1\Event::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The list of found topics
+     *
+     * Generated from protobuf field <code>repeated .nitric.event.v1.NitricTopic topics = 1;</code>
+     * @return \Google\Protobuf\Internal\RepeatedField
+     */
+    public function getTopics()
+    {
+        return $this->topics;
+    }
+
+    /**
+     * The list of found topics
+     *
+     * Generated from protobuf field <code>repeated .nitric.event.v1.NitricTopic topics = 1;</code>
+     * @param \Nitric\Proto\Event\V1\NitricTopic[]|\Google\Protobuf\Internal\RepeatedField $var
+     * @return $this
+     */
+    public function setTopics($var)
+    {
+        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Nitric\Proto\Event\V1\NitricTopic::class);
+        $this->topics = $arr;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Faas/V1/ClientMessage.php b/interfaces/Nitric/Proto/Faas/V1/ClientMessage.php
new file mode 100644
index 0000000..a351f7e
--- /dev/null
+++ b/interfaces/Nitric/Proto/Faas/V1/ClientMessage.php
@@ -0,0 +1,145 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: faas/v1/faas.proto
+
+namespace Nitric\Proto\Faas\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Messages the client is able to send to the server
+ *
+ * Generated from protobuf message <code>nitric.faas.v1.ClientMessage</code>
+ */
+class ClientMessage extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * Client message ID, used to pair requests/responses
+     *
+     * Generated from protobuf field <code>string id = 1;</code>
+     */
+    protected $id = '';
+    protected $content;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $id
+     *           Client message ID, used to pair requests/responses
+     *     @type \Nitric\Proto\Faas\V1\InitRequest $init_request
+     *           Client initialisation request
+     *     @type \Nitric\Proto\Faas\V1\TriggerResponse $trigger_response
+     *           Client responsding with result of
+     *           a trigger
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Faas\V1\Faas::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * Client message ID, used to pair requests/responses
+     *
+     * Generated from protobuf field <code>string id = 1;</code>
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Client message ID, used to pair requests/responses
+     *
+     * Generated from protobuf field <code>string id = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setId($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->id = $var;
+
+        return $this;
+    }
+
+    /**
+     * Client initialisation request
+     *
+     * Generated from protobuf field <code>.nitric.faas.v1.InitRequest init_request = 2;</code>
+     * @return \Nitric\Proto\Faas\V1\InitRequest|null
+     */
+    public function getInitRequest()
+    {
+        return $this->readOneof(2);
+    }
+
+    public function hasInitRequest()
+    {
+        return $this->hasOneof(2);
+    }
+
+    /**
+     * Client initialisation request
+     *
+     * Generated from protobuf field <code>.nitric.faas.v1.InitRequest init_request = 2;</code>
+     * @param \Nitric\Proto\Faas\V1\InitRequest $var
+     * @return $this
+     */
+    public function setInitRequest($var)
+    {
+        GPBUtil::checkMessage($var, \Nitric\Proto\Faas\V1\InitRequest::class);
+        $this->writeOneof(2, $var);
+
+        return $this;
+    }
+
+    /**
+     * Client responsding with result of
+     * a trigger
+     *
+     * Generated from protobuf field <code>.nitric.faas.v1.TriggerResponse trigger_response = 3;</code>
+     * @return \Nitric\Proto\Faas\V1\TriggerResponse|null
+     */
+    public function getTriggerResponse()
+    {
+        return $this->readOneof(3);
+    }
+
+    public function hasTriggerResponse()
+    {
+        return $this->hasOneof(3);
+    }
+
+    /**
+     * Client responsding with result of
+     * a trigger
+     *
+     * Generated from protobuf field <code>.nitric.faas.v1.TriggerResponse trigger_response = 3;</code>
+     * @param \Nitric\Proto\Faas\V1\TriggerResponse $var
+     * @return $this
+     */
+    public function setTriggerResponse($var)
+    {
+        GPBUtil::checkMessage($var, \Nitric\Proto\Faas\V1\TriggerResponse::class);
+        $this->writeOneof(3, $var);
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContent()
+    {
+        return $this->whichOneof("content");
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Faas/V1/FaasClient.php b/interfaces/Nitric/Proto/Faas/V1/FaasClient.php
new file mode 100644
index 0000000..579a17a
--- /dev/null
+++ b/interfaces/Nitric/Proto/Faas/V1/FaasClient.php
@@ -0,0 +1,32 @@
+<?php
+// GENERATED CODE -- DO NOT EDIT!
+
+namespace Nitric\Proto\Faas\V1;
+
+/**
+ * Service for management of event topics
+ */
+class FaasClient extends \Grpc\BaseStub {
+
+    /**
+     * @param string $hostname hostname
+     * @param array $opts channel options
+     * @param \Grpc\Channel $channel (optional) re-use channel object
+     */
+    public function __construct($hostname, $opts, $channel = null) {
+        parent::__construct($hostname, $opts, $channel);
+    }
+
+    /**
+     * Return a list of existing topics in the provider environment
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\BidiStreamingCall
+     */
+    public function TriggerStream($metadata = [], $options = []) {
+        return $this->_bidiRequest('/nitric.faas.v1.Faas/TriggerStream',
+        ['\Nitric\Proto\Faas\V1\ServerMessage','decode'],
+        $metadata, $options);
+    }
+
+}
diff --git a/interfaces/Nitric/Proto/Faas/V1/HttpResponseContext.php b/interfaces/Nitric/Proto/Faas/V1/HttpResponseContext.php
new file mode 100644
index 0000000..466aa39
--- /dev/null
+++ b/interfaces/Nitric/Proto/Faas/V1/HttpResponseContext.php
@@ -0,0 +1,104 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: faas/v1/faas.proto
+
+namespace Nitric\Proto\Faas\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Specific HttpResponse message
+ * Note this does not have to be handled by the
+ * User at all but they will have the option of control
+ * If they choose...
+ *
+ * Generated from protobuf message <code>nitric.faas.v1.HttpResponseContext</code>
+ */
+class HttpResponseContext extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The request headers...
+     *
+     * Generated from protobuf field <code>map<string, string> headers = 1;</code>
+     */
+    private $headers;
+    /**
+     * The HTTP status of the request
+     *
+     * Generated from protobuf field <code>int32 status = 2;</code>
+     */
+    protected $status = 0;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type array|\Google\Protobuf\Internal\MapField $headers
+     *           The request headers...
+     *     @type int $status
+     *           The HTTP status of the request
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Faas\V1\Faas::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The request headers...
+     *
+     * Generated from protobuf field <code>map<string, string> headers = 1;</code>
+     * @return \Google\Protobuf\Internal\MapField
+     */
+    public function getHeaders()
+    {
+        return $this->headers;
+    }
+
+    /**
+     * The request headers...
+     *
+     * Generated from protobuf field <code>map<string, string> headers = 1;</code>
+     * @param array|\Google\Protobuf\Internal\MapField $var
+     * @return $this
+     */
+    public function setHeaders($var)
+    {
+        $arr = GPBUtil::checkMapField($var, \Google\Protobuf\Internal\GPBType::STRING, \Google\Protobuf\Internal\GPBType::STRING);
+        $this->headers = $arr;
+
+        return $this;
+    }
+
+    /**
+     * The HTTP status of the request
+     *
+     * Generated from protobuf field <code>int32 status = 2;</code>
+     * @return int
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    /**
+     * The HTTP status of the request
+     *
+     * Generated from protobuf field <code>int32 status = 2;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setStatus($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->status = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Faas/V1/HttpTriggerContext.php b/interfaces/Nitric/Proto/Faas/V1/HttpTriggerContext.php
new file mode 100644
index 0000000..60fff3b
--- /dev/null
+++ b/interfaces/Nitric/Proto/Faas/V1/HttpTriggerContext.php
@@ -0,0 +1,167 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: faas/v1/faas.proto
+
+namespace Nitric\Proto\Faas\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>nitric.faas.v1.HttpTriggerContext</code>
+ */
+class HttpTriggerContext extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The request method
+     *
+     * Generated from protobuf field <code>string method = 1;</code>
+     */
+    protected $method = '';
+    /**
+     * The request headers
+     *
+     * Generated from protobuf field <code>map<string, string> headers = 2;</code>
+     */
+    private $headers;
+    /**
+     * The path params (if parseable by the membrane)
+     *
+     * Generated from protobuf field <code>map<string, string> path_params = 3;</code>
+     */
+    private $path_params;
+    /**
+     * The query params (if parseable by the membrane)
+     *
+     * Generated from protobuf field <code>map<string, string> query_params = 4;</code>
+     */
+    private $query_params;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $method
+     *           The request method
+     *     @type array|\Google\Protobuf\Internal\MapField $headers
+     *           The request headers
+     *     @type array|\Google\Protobuf\Internal\MapField $path_params
+     *           The path params (if parseable by the membrane)
+     *     @type array|\Google\Protobuf\Internal\MapField $query_params
+     *           The query params (if parseable by the membrane)
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Faas\V1\Faas::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The request method
+     *
+     * Generated from protobuf field <code>string method = 1;</code>
+     * @return string
+     */
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+    /**
+     * The request method
+     *
+     * Generated from protobuf field <code>string method = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setMethod($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->method = $var;
+
+        return $this;
+    }
+
+    /**
+     * The request headers
+     *
+     * Generated from protobuf field <code>map<string, string> headers = 2;</code>
+     * @return \Google\Protobuf\Internal\MapField
+     */
+    public function getHeaders()
+    {
+        return $this->headers;
+    }
+
+    /**
+     * The request headers
+     *
+     * Generated from protobuf field <code>map<string, string> headers = 2;</code>
+     * @param array|\Google\Protobuf\Internal\MapField $var
+     * @return $this
+     */
+    public function setHeaders($var)
+    {
+        $arr = GPBUtil::checkMapField($var, \Google\Protobuf\Internal\GPBType::STRING, \Google\Protobuf\Internal\GPBType::STRING);
+        $this->headers = $arr;
+
+        return $this;
+    }
+
+    /**
+     * The path params (if parseable by the membrane)
+     *
+     * Generated from protobuf field <code>map<string, string> path_params = 3;</code>
+     * @return \Google\Protobuf\Internal\MapField
+     */
+    public function getPathParams()
+    {
+        return $this->path_params;
+    }
+
+    /**
+     * The path params (if parseable by the membrane)
+     *
+     * Generated from protobuf field <code>map<string, string> path_params = 3;</code>
+     * @param array|\Google\Protobuf\Internal\MapField $var
+     * @return $this
+     */
+    public function setPathParams($var)
+    {
+        $arr = GPBUtil::checkMapField($var, \Google\Protobuf\Internal\GPBType::STRING, \Google\Protobuf\Internal\GPBType::STRING);
+        $this->path_params = $arr;
+
+        return $this;
+    }
+
+    /**
+     * The query params (if parseable by the membrane)
+     *
+     * Generated from protobuf field <code>map<string, string> query_params = 4;</code>
+     * @return \Google\Protobuf\Internal\MapField
+     */
+    public function getQueryParams()
+    {
+        return $this->query_params;
+    }
+
+    /**
+     * The query params (if parseable by the membrane)
+     *
+     * Generated from protobuf field <code>map<string, string> query_params = 4;</code>
+     * @param array|\Google\Protobuf\Internal\MapField $var
+     * @return $this
+     */
+    public function setQueryParams($var)
+    {
+        $arr = GPBUtil::checkMapField($var, \Google\Protobuf\Internal\GPBType::STRING, \Google\Protobuf\Internal\GPBType::STRING);
+        $this->query_params = $arr;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Faas/V1/InitRequest.php b/interfaces/Nitric/Proto/Faas/V1/InitRequest.php
new file mode 100644
index 0000000..10bcf78
--- /dev/null
+++ b/interfaces/Nitric/Proto/Faas/V1/InitRequest.php
@@ -0,0 +1,33 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: faas/v1/faas.proto
+
+namespace Nitric\Proto\Faas\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Placeholder message
+ *
+ * Generated from protobuf message <code>nitric.faas.v1.InitRequest</code>
+ */
+class InitRequest extends \Google\Protobuf\Internal\Message
+{
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Faas\V1\Faas::initOnce();
+        parent::__construct($data);
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Faas/V1/InitResponse.php b/interfaces/Nitric/Proto/Faas/V1/InitResponse.php
new file mode 100644
index 0000000..86b4f3b
--- /dev/null
+++ b/interfaces/Nitric/Proto/Faas/V1/InitResponse.php
@@ -0,0 +1,33 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: faas/v1/faas.proto
+
+namespace Nitric\Proto\Faas\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Placeholder message
+ *
+ * Generated from protobuf message <code>nitric.faas.v1.InitResponse</code>
+ */
+class InitResponse extends \Google\Protobuf\Internal\Message
+{
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Faas\V1\Faas::initOnce();
+        parent::__construct($data);
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Faas/V1/ServerMessage.php b/interfaces/Nitric/Proto/Faas/V1/ServerMessage.php
new file mode 100644
index 0000000..d1ce41e
--- /dev/null
+++ b/interfaces/Nitric/Proto/Faas/V1/ServerMessage.php
@@ -0,0 +1,151 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: faas/v1/faas.proto
+
+namespace Nitric\Proto\Faas\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Messages the server is able to send to the client
+ *
+ * Generated from protobuf message <code>nitric.faas.v1.ServerMessage</code>
+ */
+class ServerMessage extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * Server message ID, used to pair requests/responses
+     *
+     * Generated from protobuf field <code>string id = 1;</code>
+     */
+    protected $id = '';
+    protected $content;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $id
+     *           Server message ID, used to pair requests/responses
+     *     @type \Nitric\Proto\Faas\V1\InitResponse $init_response
+     *           Server responding
+     *           with client configuration details to an
+     *           InitRequest
+     *     @type \Nitric\Proto\Faas\V1\TriggerRequest $trigger_request
+     *           Server requesting client to
+     *           process a trigger
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Faas\V1\Faas::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * Server message ID, used to pair requests/responses
+     *
+     * Generated from protobuf field <code>string id = 1;</code>
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Server message ID, used to pair requests/responses
+     *
+     * Generated from protobuf field <code>string id = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setId($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->id = $var;
+
+        return $this;
+    }
+
+    /**
+     * Server responding
+     * with client configuration details to an
+     * InitRequest
+     *
+     * Generated from protobuf field <code>.nitric.faas.v1.InitResponse init_response = 2;</code>
+     * @return \Nitric\Proto\Faas\V1\InitResponse|null
+     */
+    public function getInitResponse()
+    {
+        return $this->readOneof(2);
+    }
+
+    public function hasInitResponse()
+    {
+        return $this->hasOneof(2);
+    }
+
+    /**
+     * Server responding
+     * with client configuration details to an
+     * InitRequest
+     *
+     * Generated from protobuf field <code>.nitric.faas.v1.InitResponse init_response = 2;</code>
+     * @param \Nitric\Proto\Faas\V1\InitResponse $var
+     * @return $this
+     */
+    public function setInitResponse($var)
+    {
+        GPBUtil::checkMessage($var, \Nitric\Proto\Faas\V1\InitResponse::class);
+        $this->writeOneof(2, $var);
+
+        return $this;
+    }
+
+    /**
+     * Server requesting client to
+     * process a trigger
+     *
+     * Generated from protobuf field <code>.nitric.faas.v1.TriggerRequest trigger_request = 3;</code>
+     * @return \Nitric\Proto\Faas\V1\TriggerRequest|null
+     */
+    public function getTriggerRequest()
+    {
+        return $this->readOneof(3);
+    }
+
+    public function hasTriggerRequest()
+    {
+        return $this->hasOneof(3);
+    }
+
+    /**
+     * Server requesting client to
+     * process a trigger
+     *
+     * Generated from protobuf field <code>.nitric.faas.v1.TriggerRequest trigger_request = 3;</code>
+     * @param \Nitric\Proto\Faas\V1\TriggerRequest $var
+     * @return $this
+     */
+    public function setTriggerRequest($var)
+    {
+        GPBUtil::checkMessage($var, \Nitric\Proto\Faas\V1\TriggerRequest::class);
+        $this->writeOneof(3, $var);
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContent()
+    {
+        return $this->whichOneof("content");
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Faas/V1/TopicResponseContext.php b/interfaces/Nitric/Proto/Faas/V1/TopicResponseContext.php
new file mode 100644
index 0000000..f7b4887
--- /dev/null
+++ b/interfaces/Nitric/Proto/Faas/V1/TopicResponseContext.php
@@ -0,0 +1,69 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: faas/v1/faas.proto
+
+namespace Nitric\Proto\Faas\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Specific event response message
+ * We do not accept responses for events
+ * only whether or not they were successfully responded to
+ *
+ * Generated from protobuf message <code>nitric.faas.v1.TopicResponseContext</code>
+ */
+class TopicResponseContext extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * Success status of the handled event
+     *
+     * Generated from protobuf field <code>bool success = 1;</code>
+     */
+    protected $success = false;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type bool $success
+     *           Success status of the handled event
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Faas\V1\Faas::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * Success status of the handled event
+     *
+     * Generated from protobuf field <code>bool success = 1;</code>
+     * @return bool
+     */
+    public function getSuccess()
+    {
+        return $this->success;
+    }
+
+    /**
+     * Success status of the handled event
+     *
+     * Generated from protobuf field <code>bool success = 1;</code>
+     * @param bool $var
+     * @return $this
+     */
+    public function setSuccess($var)
+    {
+        GPBUtil::checkBool($var);
+        $this->success = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Faas/V1/TopicTriggerContext.php b/interfaces/Nitric/Proto/Faas/V1/TopicTriggerContext.php
new file mode 100644
index 0000000..a494ffe
--- /dev/null
+++ b/interfaces/Nitric/Proto/Faas/V1/TopicTriggerContext.php
@@ -0,0 +1,65 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: faas/v1/faas.proto
+
+namespace Nitric\Proto\Faas\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>nitric.faas.v1.TopicTriggerContext</code>
+ */
+class TopicTriggerContext extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The topic the message was published for
+     *
+     * Generated from protobuf field <code>string topic = 1;</code>
+     */
+    protected $topic = '';
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $topic
+     *           The topic the message was published for
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Faas\V1\Faas::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The topic the message was published for
+     *
+     * Generated from protobuf field <code>string topic = 1;</code>
+     * @return string
+     */
+    public function getTopic()
+    {
+        return $this->topic;
+    }
+
+    /**
+     * The topic the message was published for
+     *
+     * Generated from protobuf field <code>string topic = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setTopic($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->topic = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Faas/V1/TriggerRequest.php b/interfaces/Nitric/Proto/Faas/V1/TriggerRequest.php
new file mode 100644
index 0000000..56e3f28
--- /dev/null
+++ b/interfaces/Nitric/Proto/Faas/V1/TriggerRequest.php
@@ -0,0 +1,132 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: faas/v1/faas.proto
+
+namespace Nitric\Proto\Faas\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * The membrane has a trigger for this function to handle
+ *
+ * Generated from protobuf message <code>nitric.faas.v1.TriggerRequest</code>
+ */
+class TriggerRequest extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The data in the trigger
+     *
+     * Generated from protobuf field <code>bytes data = 1;</code>
+     */
+    protected $data = '';
+    protected $context;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $data
+     *           The data in the trigger
+     *     @type \Nitric\Proto\Faas\V1\HttpTriggerContext $http
+     *     @type \Nitric\Proto\Faas\V1\TopicTriggerContext $topic
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Faas\V1\Faas::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The data in the trigger
+     *
+     * Generated from protobuf field <code>bytes data = 1;</code>
+     * @return string
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    /**
+     * The data in the trigger
+     *
+     * Generated from protobuf field <code>bytes data = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setData($var)
+    {
+        GPBUtil::checkString($var, False);
+        $this->data = $var;
+
+        return $this;
+    }
+
+    /**
+     * Generated from protobuf field <code>.nitric.faas.v1.HttpTriggerContext http = 2;</code>
+     * @return \Nitric\Proto\Faas\V1\HttpTriggerContext|null
+     */
+    public function getHttp()
+    {
+        return $this->readOneof(2);
+    }
+
+    public function hasHttp()
+    {
+        return $this->hasOneof(2);
+    }
+
+    /**
+     * Generated from protobuf field <code>.nitric.faas.v1.HttpTriggerContext http = 2;</code>
+     * @param \Nitric\Proto\Faas\V1\HttpTriggerContext $var
+     * @return $this
+     */
+    public function setHttp($var)
+    {
+        GPBUtil::checkMessage($var, \Nitric\Proto\Faas\V1\HttpTriggerContext::class);
+        $this->writeOneof(2, $var);
+
+        return $this;
+    }
+
+    /**
+     * Generated from protobuf field <code>.nitric.faas.v1.TopicTriggerContext topic = 3;</code>
+     * @return \Nitric\Proto\Faas\V1\TopicTriggerContext|null
+     */
+    public function getTopic()
+    {
+        return $this->readOneof(3);
+    }
+
+    public function hasTopic()
+    {
+        return $this->hasOneof(3);
+    }
+
+    /**
+     * Generated from protobuf field <code>.nitric.faas.v1.TopicTriggerContext topic = 3;</code>
+     * @param \Nitric\Proto\Faas\V1\TopicTriggerContext $var
+     * @return $this
+     */
+    public function setTopic($var)
+    {
+        GPBUtil::checkMessage($var, \Nitric\Proto\Faas\V1\TopicTriggerContext::class);
+        $this->writeOneof(3, $var);
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContext()
+    {
+        return $this->whichOneof("context");
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Faas/V1/TriggerResponse.php b/interfaces/Nitric/Proto/Faas/V1/TriggerResponse.php
new file mode 100644
index 0000000..f409cad
--- /dev/null
+++ b/interfaces/Nitric/Proto/Faas/V1/TriggerResponse.php
@@ -0,0 +1,142 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: faas/v1/faas.proto
+
+namespace Nitric\Proto\Faas\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * The worker has successfully processed a trigger
+ *
+ * Generated from protobuf message <code>nitric.faas.v1.TriggerResponse</code>
+ */
+class TriggerResponse extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The data returned in the response
+     *
+     * Generated from protobuf field <code>bytes data = 1;</code>
+     */
+    protected $data = '';
+    protected $context;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $data
+     *           The data returned in the response
+     *     @type \Nitric\Proto\Faas\V1\HttpResponseContext $http
+     *           response to a http request
+     *     @type \Nitric\Proto\Faas\V1\TopicResponseContext $topic
+     *           response to a topic trigger
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Faas\V1\Faas::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The data returned in the response
+     *
+     * Generated from protobuf field <code>bytes data = 1;</code>
+     * @return string
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    /**
+     * The data returned in the response
+     *
+     * Generated from protobuf field <code>bytes data = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setData($var)
+    {
+        GPBUtil::checkString($var, False);
+        $this->data = $var;
+
+        return $this;
+    }
+
+    /**
+     * response to a http request
+     *
+     * Generated from protobuf field <code>.nitric.faas.v1.HttpResponseContext http = 2;</code>
+     * @return \Nitric\Proto\Faas\V1\HttpResponseContext|null
+     */
+    public function getHttp()
+    {
+        return $this->readOneof(2);
+    }
+
+    public function hasHttp()
+    {
+        return $this->hasOneof(2);
+    }
+
+    /**
+     * response to a http request
+     *
+     * Generated from protobuf field <code>.nitric.faas.v1.HttpResponseContext http = 2;</code>
+     * @param \Nitric\Proto\Faas\V1\HttpResponseContext $var
+     * @return $this
+     */
+    public function setHttp($var)
+    {
+        GPBUtil::checkMessage($var, \Nitric\Proto\Faas\V1\HttpResponseContext::class);
+        $this->writeOneof(2, $var);
+
+        return $this;
+    }
+
+    /**
+     * response to a topic trigger
+     *
+     * Generated from protobuf field <code>.nitric.faas.v1.TopicResponseContext topic = 3;</code>
+     * @return \Nitric\Proto\Faas\V1\TopicResponseContext|null
+     */
+    public function getTopic()
+    {
+        return $this->readOneof(3);
+    }
+
+    public function hasTopic()
+    {
+        return $this->hasOneof(3);
+    }
+
+    /**
+     * response to a topic trigger
+     *
+     * Generated from protobuf field <code>.nitric.faas.v1.TopicResponseContext topic = 3;</code>
+     * @param \Nitric\Proto\Faas\V1\TopicResponseContext $var
+     * @return $this
+     */
+    public function setTopic($var)
+    {
+        GPBUtil::checkMessage($var, \Nitric\Proto\Faas\V1\TopicResponseContext::class);
+        $this->writeOneof(3, $var);
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContext()
+    {
+        return $this->whichOneof("context");
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/KeyValue/V1/KeyValueClient.php b/interfaces/Nitric/Proto/KeyValue/V1/KeyValueClient.php
new file mode 100644
index 0000000..559fa35
--- /dev/null
+++ b/interfaces/Nitric/Proto/KeyValue/V1/KeyValueClient.php
@@ -0,0 +1,65 @@
+<?php
+// GENERATED CODE -- DO NOT EDIT!
+
+namespace Nitric\Proto\KeyValue\V1;
+
+/**
+ * Service for storage and retrieval of simple JSON keyValue
+ */
+class KeyValueClient extends \Grpc\BaseStub {
+
+    /**
+     * @param string $hostname hostname
+     * @param array $opts channel options
+     * @param \Grpc\Channel $channel (optional) re-use channel object
+     */
+    public function __construct($hostname, $opts, $channel = null) {
+        parent::__construct($hostname, $opts, $channel);
+    }
+
+    /**
+     * Get an existing key
+     * @param \Nitric\Proto\KeyValue\V1\KeyValueGetRequest $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function Get(\Nitric\Proto\KeyValue\V1\KeyValueGetRequest $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/nitric.kv.v1.KeyValue/Get',
+        $argument,
+        ['\Nitric\Proto\KeyValue\V1\KeyValueGetResponse', 'decode'],
+        $metadata, $options);
+    }
+
+    /**
+     * Create a new or overwrite and existing key
+     * @param \Nitric\Proto\KeyValue\V1\KeyValuePutRequest $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function Put(\Nitric\Proto\KeyValue\V1\KeyValuePutRequest $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/nitric.kv.v1.KeyValue/Put',
+        $argument,
+        ['\Nitric\Proto\KeyValue\V1\KeyValuePutResponse', 'decode'],
+        $metadata, $options);
+    }
+
+    /**
+     * Delete an existing
+     * @param \Nitric\Proto\KeyValue\V1\KeyValueDeleteRequest $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function Delete(\Nitric\Proto\KeyValue\V1\KeyValueDeleteRequest $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/nitric.kv.v1.KeyValue/Delete',
+        $argument,
+        ['\Nitric\Proto\KeyValue\V1\KeyValueDeleteResponse', 'decode'],
+        $metadata, $options);
+    }
+
+}
diff --git a/interfaces/Nitric/Proto/KeyValue/V1/KeyValueDeleteRequest.php b/interfaces/Nitric/Proto/KeyValue/V1/KeyValueDeleteRequest.php
new file mode 100644
index 0000000..ace272d
--- /dev/null
+++ b/interfaces/Nitric/Proto/KeyValue/V1/KeyValueDeleteRequest.php
@@ -0,0 +1,99 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: kv/v1/kv.proto
+
+namespace Nitric\Proto\KeyValue\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>nitric.kv.v1.KeyValueDeleteRequest</code>
+ */
+class KeyValueDeleteRequest extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The collection containing the existing keyValue to be deleted
+     *
+     * Generated from protobuf field <code>string collection = 1;</code>
+     */
+    protected $collection = '';
+    /**
+     * The unique key of the keyValue to delete
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     */
+    protected $key = '';
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $collection
+     *           The collection containing the existing keyValue to be deleted
+     *     @type string $key
+     *           The unique key of the keyValue to delete
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Kv\V1\Kv::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The collection containing the existing keyValue to be deleted
+     *
+     * Generated from protobuf field <code>string collection = 1;</code>
+     * @return string
+     */
+    public function getCollection()
+    {
+        return $this->collection;
+    }
+
+    /**
+     * The collection containing the existing keyValue to be deleted
+     *
+     * Generated from protobuf field <code>string collection = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setCollection($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->collection = $var;
+
+        return $this;
+    }
+
+    /**
+     * The unique key of the keyValue to delete
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     * @return string
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+
+    /**
+     * The unique key of the keyValue to delete
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setKey($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->key = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/KeyValue/V1/KeyValueDeleteResponse.php b/interfaces/Nitric/Proto/KeyValue/V1/KeyValueDeleteResponse.php
new file mode 100644
index 0000000..413adc8
--- /dev/null
+++ b/interfaces/Nitric/Proto/KeyValue/V1/KeyValueDeleteResponse.php
@@ -0,0 +1,31 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: kv/v1/kv.proto
+
+namespace Nitric\Proto\KeyValue\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>nitric.kv.v1.KeyValueDeleteResponse</code>
+ */
+class KeyValueDeleteResponse extends \Google\Protobuf\Internal\Message
+{
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Kv\V1\Kv::initOnce();
+        parent::__construct($data);
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/KeyValue/V1/KeyValueGetRequest.php b/interfaces/Nitric/Proto/KeyValue/V1/KeyValueGetRequest.php
new file mode 100644
index 0000000..a1ba44d
--- /dev/null
+++ b/interfaces/Nitric/Proto/KeyValue/V1/KeyValueGetRequest.php
@@ -0,0 +1,99 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: kv/v1/kv.proto
+
+namespace Nitric\Proto\KeyValue\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>nitric.kv.v1.KeyValueGetRequest</code>
+ */
+class KeyValueGetRequest extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The collection to retrieve the keyValue from
+     *
+     * Generated from protobuf field <code>string collection = 1;</code>
+     */
+    protected $collection = '';
+    /**
+     * The unique key of the keyValue to retrieve
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     */
+    protected $key = '';
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $collection
+     *           The collection to retrieve the keyValue from
+     *     @type string $key
+     *           The unique key of the keyValue to retrieve
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Kv\V1\Kv::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The collection to retrieve the keyValue from
+     *
+     * Generated from protobuf field <code>string collection = 1;</code>
+     * @return string
+     */
+    public function getCollection()
+    {
+        return $this->collection;
+    }
+
+    /**
+     * The collection to retrieve the keyValue from
+     *
+     * Generated from protobuf field <code>string collection = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setCollection($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->collection = $var;
+
+        return $this;
+    }
+
+    /**
+     * The unique key of the keyValue to retrieve
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     * @return string
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+
+    /**
+     * The unique key of the keyValue to retrieve
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setKey($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->key = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/KeyValue/V1/KeyValueGetResponse.php b/interfaces/Nitric/Proto/KeyValue/V1/KeyValueGetResponse.php
new file mode 100644
index 0000000..4797294
--- /dev/null
+++ b/interfaces/Nitric/Proto/KeyValue/V1/KeyValueGetResponse.php
@@ -0,0 +1,75 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: kv/v1/kv.proto
+
+namespace Nitric\Proto\KeyValue\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>nitric.kv.v1.KeyValueGetResponse</code>
+ */
+class KeyValueGetResponse extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The retrieved value
+     *
+     * Generated from protobuf field <code>.google.protobuf.Struct value = 1;</code>
+     */
+    protected $value = null;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type \Google\Protobuf\Struct $value
+     *           The retrieved value
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Kv\V1\Kv::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The retrieved value
+     *
+     * Generated from protobuf field <code>.google.protobuf.Struct value = 1;</code>
+     * @return \Google\Protobuf\Struct|null
+     */
+    public function getValue()
+    {
+        return isset($this->value) ? $this->value : null;
+    }
+
+    public function hasValue()
+    {
+        return isset($this->value);
+    }
+
+    public function clearValue()
+    {
+        unset($this->value);
+    }
+
+    /**
+     * The retrieved value
+     *
+     * Generated from protobuf field <code>.google.protobuf.Struct value = 1;</code>
+     * @param \Google\Protobuf\Struct $var
+     * @return $this
+     */
+    public function setValue($var)
+    {
+        GPBUtil::checkMessage($var, \Google\Protobuf\Struct::class);
+        $this->value = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/KeyValue/V1/KeyValuePutRequest.php b/interfaces/Nitric/Proto/KeyValue/V1/KeyValuePutRequest.php
new file mode 100644
index 0000000..fcf4180
--- /dev/null
+++ b/interfaces/Nitric/Proto/KeyValue/V1/KeyValuePutRequest.php
@@ -0,0 +1,143 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: kv/v1/kv.proto
+
+namespace Nitric\Proto\KeyValue\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>nitric.kv.v1.KeyValuePutRequest</code>
+ */
+class KeyValuePutRequest extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The collection containing the existing keyValue to be inserted or updated.
+     *
+     * Generated from protobuf field <code>string collection = 1;</code>
+     */
+    protected $collection = '';
+    /**
+     * The unique key of the keyValue to put
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     */
+    protected $key = '';
+    /**
+     * A simple JSON object
+     *
+     * Generated from protobuf field <code>.google.protobuf.Struct value = 3;</code>
+     */
+    protected $value = null;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $collection
+     *           The collection containing the existing keyValue to be inserted or updated.
+     *     @type string $key
+     *           The unique key of the keyValue to put
+     *     @type \Google\Protobuf\Struct $value
+     *           A simple JSON object
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Kv\V1\Kv::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The collection containing the existing keyValue to be inserted or updated.
+     *
+     * Generated from protobuf field <code>string collection = 1;</code>
+     * @return string
+     */
+    public function getCollection()
+    {
+        return $this->collection;
+    }
+
+    /**
+     * The collection containing the existing keyValue to be inserted or updated.
+     *
+     * Generated from protobuf field <code>string collection = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setCollection($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->collection = $var;
+
+        return $this;
+    }
+
+    /**
+     * The unique key of the keyValue to put
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     * @return string
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+
+    /**
+     * The unique key of the keyValue to put
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setKey($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->key = $var;
+
+        return $this;
+    }
+
+    /**
+     * A simple JSON object
+     *
+     * Generated from protobuf field <code>.google.protobuf.Struct value = 3;</code>
+     * @return \Google\Protobuf\Struct|null
+     */
+    public function getValue()
+    {
+        return isset($this->value) ? $this->value : null;
+    }
+
+    public function hasValue()
+    {
+        return isset($this->value);
+    }
+
+    public function clearValue()
+    {
+        unset($this->value);
+    }
+
+    /**
+     * A simple JSON object
+     *
+     * Generated from protobuf field <code>.google.protobuf.Struct value = 3;</code>
+     * @param \Google\Protobuf\Struct $var
+     * @return $this
+     */
+    public function setValue($var)
+    {
+        GPBUtil::checkMessage($var, \Google\Protobuf\Struct::class);
+        $this->value = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/KeyValue/V1/KeyValuePutResponse.php b/interfaces/Nitric/Proto/KeyValue/V1/KeyValuePutResponse.php
new file mode 100644
index 0000000..eedb35c
--- /dev/null
+++ b/interfaces/Nitric/Proto/KeyValue/V1/KeyValuePutResponse.php
@@ -0,0 +1,31 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: kv/v1/kv.proto
+
+namespace Nitric\Proto\KeyValue\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>nitric.kv.v1.KeyValuePutResponse</code>
+ */
+class KeyValuePutResponse extends \Google\Protobuf\Internal\Message
+{
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Kv\V1\Kv::initOnce();
+        parent::__construct($data);
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Queue/V1/FailedTask.php b/interfaces/Nitric/Proto/Queue/V1/FailedTask.php
new file mode 100644
index 0000000..6f99c95
--- /dev/null
+++ b/interfaces/Nitric/Proto/Queue/V1/FailedTask.php
@@ -0,0 +1,109 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: queue/v1/queue.proto
+
+namespace Nitric\Proto\Queue\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>nitric.queue.v1.FailedTask</code>
+ */
+class FailedTask extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The task that failed to be pushed
+     *
+     * Generated from protobuf field <code>.nitric.queue.v1.NitricTask task = 1;</code>
+     */
+    protected $task = null;
+    /**
+     * A message describing the failure
+     *
+     * Generated from protobuf field <code>string message = 2;</code>
+     */
+    protected $message = '';
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type \Nitric\Proto\Queue\V1\NitricTask $task
+     *           The task that failed to be pushed
+     *     @type string $message
+     *           A message describing the failure
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Queue\V1\Queue::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The task that failed to be pushed
+     *
+     * Generated from protobuf field <code>.nitric.queue.v1.NitricTask task = 1;</code>
+     * @return \Nitric\Proto\Queue\V1\NitricTask|null
+     */
+    public function getTask()
+    {
+        return isset($this->task) ? $this->task : null;
+    }
+
+    public function hasTask()
+    {
+        return isset($this->task);
+    }
+
+    public function clearTask()
+    {
+        unset($this->task);
+    }
+
+    /**
+     * The task that failed to be pushed
+     *
+     * Generated from protobuf field <code>.nitric.queue.v1.NitricTask task = 1;</code>
+     * @param \Nitric\Proto\Queue\V1\NitricTask $var
+     * @return $this
+     */
+    public function setTask($var)
+    {
+        GPBUtil::checkMessage($var, \Nitric\Proto\Queue\V1\NitricTask::class);
+        $this->task = $var;
+
+        return $this;
+    }
+
+    /**
+     * A message describing the failure
+     *
+     * Generated from protobuf field <code>string message = 2;</code>
+     * @return string
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    /**
+     * A message describing the failure
+     *
+     * Generated from protobuf field <code>string message = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setMessage($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->message = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Queue/V1/NitricTask.php b/interfaces/Nitric/Proto/Queue/V1/NitricTask.php
new file mode 100644
index 0000000..f70be99
--- /dev/null
+++ b/interfaces/Nitric/Proto/Queue/V1/NitricTask.php
@@ -0,0 +1,179 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: queue/v1/queue.proto
+
+namespace Nitric\Proto\Queue\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * A task to be sent or received from a queue.
+ *
+ * Generated from protobuf message <code>nitric.queue.v1.NitricTask</code>
+ */
+class NitricTask extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * A unique id for the task
+     *
+     * Generated from protobuf field <code>string id = 1;</code>
+     */
+    protected $id = '';
+    /**
+     * The lease id unique to the pop request, this must be used to complete, extend the lease or release the task.
+     *
+     * Generated from protobuf field <code>string leaseId = 2;</code>
+     */
+    protected $leaseId = '';
+    /**
+     * A content hint for the tasks payload
+     *
+     * Generated from protobuf field <code>string payloadType = 3;</code>
+     */
+    protected $payloadType = '';
+    /**
+     * The payload of the task
+     *
+     * Generated from protobuf field <code>.google.protobuf.Struct payload = 4;</code>
+     */
+    protected $payload = null;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $id
+     *           A unique id for the task
+     *     @type string $leaseId
+     *           The lease id unique to the pop request, this must be used to complete, extend the lease or release the task.
+     *     @type string $payloadType
+     *           A content hint for the tasks payload
+     *     @type \Google\Protobuf\Struct $payload
+     *           The payload of the task
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Queue\V1\Queue::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * A unique id for the task
+     *
+     * Generated from protobuf field <code>string id = 1;</code>
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * A unique id for the task
+     *
+     * Generated from protobuf field <code>string id = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setId($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->id = $var;
+
+        return $this;
+    }
+
+    /**
+     * The lease id unique to the pop request, this must be used to complete, extend the lease or release the task.
+     *
+     * Generated from protobuf field <code>string leaseId = 2;</code>
+     * @return string
+     */
+    public function getLeaseId()
+    {
+        return $this->leaseId;
+    }
+
+    /**
+     * The lease id unique to the pop request, this must be used to complete, extend the lease or release the task.
+     *
+     * Generated from protobuf field <code>string leaseId = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setLeaseId($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->leaseId = $var;
+
+        return $this;
+    }
+
+    /**
+     * A content hint for the tasks payload
+     *
+     * Generated from protobuf field <code>string payloadType = 3;</code>
+     * @return string
+     */
+    public function getPayloadType()
+    {
+        return $this->payloadType;
+    }
+
+    /**
+     * A content hint for the tasks payload
+     *
+     * Generated from protobuf field <code>string payloadType = 3;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setPayloadType($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->payloadType = $var;
+
+        return $this;
+    }
+
+    /**
+     * The payload of the task
+     *
+     * Generated from protobuf field <code>.google.protobuf.Struct payload = 4;</code>
+     * @return \Google\Protobuf\Struct|null
+     */
+    public function getPayload()
+    {
+        return isset($this->payload) ? $this->payload : null;
+    }
+
+    public function hasPayload()
+    {
+        return isset($this->payload);
+    }
+
+    public function clearPayload()
+    {
+        unset($this->payload);
+    }
+
+    /**
+     * The payload of the task
+     *
+     * Generated from protobuf field <code>.google.protobuf.Struct payload = 4;</code>
+     * @param \Google\Protobuf\Struct $var
+     * @return $this
+     */
+    public function setPayload($var)
+    {
+        GPBUtil::checkMessage($var, \Google\Protobuf\Struct::class);
+        $this->payload = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Queue/V1/QueueClient.php b/interfaces/Nitric/Proto/Queue/V1/QueueClient.php
new file mode 100644
index 0000000..f41fda7
--- /dev/null
+++ b/interfaces/Nitric/Proto/Queue/V1/QueueClient.php
@@ -0,0 +1,80 @@
+<?php
+// GENERATED CODE -- DO NOT EDIT!
+
+namespace Nitric\Proto\Queue\V1;
+
+/**
+ * The Nitric Queue Service contract
+ */
+class QueueClient extends \Grpc\BaseStub {
+
+    /**
+     * @param string $hostname hostname
+     * @param array $opts channel options
+     * @param \Grpc\Channel $channel (optional) re-use channel object
+     */
+    public function __construct($hostname, $opts, $channel = null) {
+        parent::__construct($hostname, $opts, $channel);
+    }
+
+    /**
+     * Send a single event to a queue
+     * @param \Nitric\Proto\Queue\V1\QueueSendRequest $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function Send(\Nitric\Proto\Queue\V1\QueueSendRequest $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/nitric.queue.v1.Queue/Send',
+        $argument,
+        ['\Nitric\Proto\Queue\V1\QueueSendResponse', 'decode'],
+        $metadata, $options);
+    }
+
+    /**
+     * Send multiple events to a queue
+     * @param \Nitric\Proto\Queue\V1\QueueSendBatchRequest $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function SendBatch(\Nitric\Proto\Queue\V1\QueueSendBatchRequest $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/nitric.queue.v1.Queue/SendBatch',
+        $argument,
+        ['\Nitric\Proto\Queue\V1\QueueSendBatchResponse', 'decode'],
+        $metadata, $options);
+    }
+
+    /**
+     * Receive event(s) off a queue
+     * @param \Nitric\Proto\Queue\V1\QueueReceiveRequest $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function Receive(\Nitric\Proto\Queue\V1\QueueReceiveRequest $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/nitric.queue.v1.Queue/Receive',
+        $argument,
+        ['\Nitric\Proto\Queue\V1\QueueReceiveResponse', 'decode'],
+        $metadata, $options);
+    }
+
+    /**
+     * Complete an event previously popped from a queue
+     * @param \Nitric\Proto\Queue\V1\QueueCompleteRequest $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function Complete(\Nitric\Proto\Queue\V1\QueueCompleteRequest $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/nitric.queue.v1.Queue/Complete',
+        $argument,
+        ['\Nitric\Proto\Queue\V1\QueueCompleteResponse', 'decode'],
+        $metadata, $options);
+    }
+
+}
diff --git a/interfaces/Nitric/Proto/Queue/V1/QueueCompleteRequest.php b/interfaces/Nitric/Proto/Queue/V1/QueueCompleteRequest.php
new file mode 100644
index 0000000..4318e1a
--- /dev/null
+++ b/interfaces/Nitric/Proto/Queue/V1/QueueCompleteRequest.php
@@ -0,0 +1,103 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: queue/v1/queue.proto
+
+namespace Nitric\Proto\Queue\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>nitric.queue.v1.QueueCompleteRequest</code>
+ */
+class QueueCompleteRequest extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The nitric name for the queue
+     *  this will automatically be resolved to the provider specific queue identifier.
+     *
+     * Generated from protobuf field <code>string queue = 1;</code>
+     */
+    protected $queue = '';
+    /**
+     * Lease id of the task to be completed
+     *
+     * Generated from protobuf field <code>string leaseId = 2;</code>
+     */
+    protected $leaseId = '';
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $queue
+     *           The nitric name for the queue
+     *            this will automatically be resolved to the provider specific queue identifier.
+     *     @type string $leaseId
+     *           Lease id of the task to be completed
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Queue\V1\Queue::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The nitric name for the queue
+     *  this will automatically be resolved to the provider specific queue identifier.
+     *
+     * Generated from protobuf field <code>string queue = 1;</code>
+     * @return string
+     */
+    public function getQueue()
+    {
+        return $this->queue;
+    }
+
+    /**
+     * The nitric name for the queue
+     *  this will automatically be resolved to the provider specific queue identifier.
+     *
+     * Generated from protobuf field <code>string queue = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setQueue($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->queue = $var;
+
+        return $this;
+    }
+
+    /**
+     * Lease id of the task to be completed
+     *
+     * Generated from protobuf field <code>string leaseId = 2;</code>
+     * @return string
+     */
+    public function getLeaseId()
+    {
+        return $this->leaseId;
+    }
+
+    /**
+     * Lease id of the task to be completed
+     *
+     * Generated from protobuf field <code>string leaseId = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setLeaseId($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->leaseId = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Queue/V1/QueueCompleteResponse.php b/interfaces/Nitric/Proto/Queue/V1/QueueCompleteResponse.php
new file mode 100644
index 0000000..73eaa06
--- /dev/null
+++ b/interfaces/Nitric/Proto/Queue/V1/QueueCompleteResponse.php
@@ -0,0 +1,31 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: queue/v1/queue.proto
+
+namespace Nitric\Proto\Queue\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>nitric.queue.v1.QueueCompleteResponse</code>
+ */
+class QueueCompleteResponse extends \Google\Protobuf\Internal\Message
+{
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Queue\V1\Queue::initOnce();
+        parent::__construct($data);
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Queue/V1/QueueReceiveRequest.php b/interfaces/Nitric/Proto/Queue/V1/QueueReceiveRequest.php
new file mode 100644
index 0000000..4ca2bff
--- /dev/null
+++ b/interfaces/Nitric/Proto/Queue/V1/QueueReceiveRequest.php
@@ -0,0 +1,103 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: queue/v1/queue.proto
+
+namespace Nitric\Proto\Queue\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>nitric.queue.v1.QueueReceiveRequest</code>
+ */
+class QueueReceiveRequest extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The nitric name for the queue
+     * this will automatically be resolved to the provider specific queue identifier.
+     *
+     * Generated from protobuf field <code>string queue = 1;</code>
+     */
+    protected $queue = '';
+    /**
+     * The max number of items to pop off the queue, may be capped by provider specific limitations
+     *
+     * Generated from protobuf field <code>int32 depth = 2;</code>
+     */
+    protected $depth = 0;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $queue
+     *           The nitric name for the queue
+     *           this will automatically be resolved to the provider specific queue identifier.
+     *     @type int $depth
+     *           The max number of items to pop off the queue, may be capped by provider specific limitations
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Queue\V1\Queue::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The nitric name for the queue
+     * this will automatically be resolved to the provider specific queue identifier.
+     *
+     * Generated from protobuf field <code>string queue = 1;</code>
+     * @return string
+     */
+    public function getQueue()
+    {
+        return $this->queue;
+    }
+
+    /**
+     * The nitric name for the queue
+     * this will automatically be resolved to the provider specific queue identifier.
+     *
+     * Generated from protobuf field <code>string queue = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setQueue($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->queue = $var;
+
+        return $this;
+    }
+
+    /**
+     * The max number of items to pop off the queue, may be capped by provider specific limitations
+     *
+     * Generated from protobuf field <code>int32 depth = 2;</code>
+     * @return int
+     */
+    public function getDepth()
+    {
+        return $this->depth;
+    }
+
+    /**
+     * The max number of items to pop off the queue, may be capped by provider specific limitations
+     *
+     * Generated from protobuf field <code>int32 depth = 2;</code>
+     * @param int $var
+     * @return $this
+     */
+    public function setDepth($var)
+    {
+        GPBUtil::checkInt32($var);
+        $this->depth = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Queue/V1/QueueReceiveResponse.php b/interfaces/Nitric/Proto/Queue/V1/QueueReceiveResponse.php
new file mode 100644
index 0000000..66619f6
--- /dev/null
+++ b/interfaces/Nitric/Proto/Queue/V1/QueueReceiveResponse.php
@@ -0,0 +1,65 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: queue/v1/queue.proto
+
+namespace Nitric\Proto\Queue\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>nitric.queue.v1.QueueReceiveResponse</code>
+ */
+class QueueReceiveResponse extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * Array of tasks popped off the queue
+     *
+     * Generated from protobuf field <code>repeated .nitric.queue.v1.NitricTask tasks = 1;</code>
+     */
+    private $tasks;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type \Nitric\Proto\Queue\V1\NitricTask[]|\Google\Protobuf\Internal\RepeatedField $tasks
+     *           Array of tasks popped off the queue
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Queue\V1\Queue::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * Array of tasks popped off the queue
+     *
+     * Generated from protobuf field <code>repeated .nitric.queue.v1.NitricTask tasks = 1;</code>
+     * @return \Google\Protobuf\Internal\RepeatedField
+     */
+    public function getTasks()
+    {
+        return $this->tasks;
+    }
+
+    /**
+     * Array of tasks popped off the queue
+     *
+     * Generated from protobuf field <code>repeated .nitric.queue.v1.NitricTask tasks = 1;</code>
+     * @param \Nitric\Proto\Queue\V1\NitricTask[]|\Google\Protobuf\Internal\RepeatedField $var
+     * @return $this
+     */
+    public function setTasks($var)
+    {
+        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Nitric\Proto\Queue\V1\NitricTask::class);
+        $this->tasks = $arr;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Queue/V1/QueueSendBatchRequest.php b/interfaces/Nitric/Proto/Queue/V1/QueueSendBatchRequest.php
new file mode 100644
index 0000000..d930dc6
--- /dev/null
+++ b/interfaces/Nitric/Proto/Queue/V1/QueueSendBatchRequest.php
@@ -0,0 +1,103 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: queue/v1/queue.proto
+
+namespace Nitric\Proto\Queue\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Generated from protobuf message <code>nitric.queue.v1.QueueSendBatchRequest</code>
+ */
+class QueueSendBatchRequest extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The Nitric name for the queue
+     * this will automatically be resolved to the provider specific queue identifier.
+     *
+     * Generated from protobuf field <code>string queue = 1;</code>
+     */
+    protected $queue = '';
+    /**
+     * Array of tasks to push to the queue
+     *
+     * Generated from protobuf field <code>repeated .nitric.queue.v1.NitricTask tasks = 2;</code>
+     */
+    private $tasks;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $queue
+     *           The Nitric name for the queue
+     *           this will automatically be resolved to the provider specific queue identifier.
+     *     @type \Nitric\Proto\Queue\V1\NitricTask[]|\Google\Protobuf\Internal\RepeatedField $tasks
+     *           Array of tasks to push to the queue
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Queue\V1\Queue::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The Nitric name for the queue
+     * this will automatically be resolved to the provider specific queue identifier.
+     *
+     * Generated from protobuf field <code>string queue = 1;</code>
+     * @return string
+     */
+    public function getQueue()
+    {
+        return $this->queue;
+    }
+
+    /**
+     * The Nitric name for the queue
+     * this will automatically be resolved to the provider specific queue identifier.
+     *
+     * Generated from protobuf field <code>string queue = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setQueue($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->queue = $var;
+
+        return $this;
+    }
+
+    /**
+     * Array of tasks to push to the queue
+     *
+     * Generated from protobuf field <code>repeated .nitric.queue.v1.NitricTask tasks = 2;</code>
+     * @return \Google\Protobuf\Internal\RepeatedField
+     */
+    public function getTasks()
+    {
+        return $this->tasks;
+    }
+
+    /**
+     * Array of tasks to push to the queue
+     *
+     * Generated from protobuf field <code>repeated .nitric.queue.v1.NitricTask tasks = 2;</code>
+     * @param \Nitric\Proto\Queue\V1\NitricTask[]|\Google\Protobuf\Internal\RepeatedField $var
+     * @return $this
+     */
+    public function setTasks($var)
+    {
+        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Nitric\Proto\Queue\V1\NitricTask::class);
+        $this->tasks = $arr;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Queue/V1/QueueSendBatchResponse.php b/interfaces/Nitric/Proto/Queue/V1/QueueSendBatchResponse.php
new file mode 100644
index 0000000..47bac95
--- /dev/null
+++ b/interfaces/Nitric/Proto/Queue/V1/QueueSendBatchResponse.php
@@ -0,0 +1,67 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: queue/v1/queue.proto
+
+namespace Nitric\Proto\Queue\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Response for sending a collection of tasks
+ *
+ * Generated from protobuf message <code>nitric.queue.v1.QueueSendBatchResponse</code>
+ */
+class QueueSendBatchResponse extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * A list of tasks that failed to be queued
+     *
+     * Generated from protobuf field <code>repeated .nitric.queue.v1.FailedTask failedTasks = 1;</code>
+     */
+    private $failedTasks;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type \Nitric\Proto\Queue\V1\FailedTask[]|\Google\Protobuf\Internal\RepeatedField $failedTasks
+     *           A list of tasks that failed to be queued
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Queue\V1\Queue::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * A list of tasks that failed to be queued
+     *
+     * Generated from protobuf field <code>repeated .nitric.queue.v1.FailedTask failedTasks = 1;</code>
+     * @return \Google\Protobuf\Internal\RepeatedField
+     */
+    public function getFailedTasks()
+    {
+        return $this->failedTasks;
+    }
+
+    /**
+     * A list of tasks that failed to be queued
+     *
+     * Generated from protobuf field <code>repeated .nitric.queue.v1.FailedTask failedTasks = 1;</code>
+     * @param \Nitric\Proto\Queue\V1\FailedTask[]|\Google\Protobuf\Internal\RepeatedField $var
+     * @return $this
+     */
+    public function setFailedTasks($var)
+    {
+        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Nitric\Proto\Queue\V1\FailedTask::class);
+        $this->failedTasks = $arr;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Queue/V1/QueueSendRequest.php b/interfaces/Nitric/Proto/Queue/V1/QueueSendRequest.php
new file mode 100644
index 0000000..26cb060
--- /dev/null
+++ b/interfaces/Nitric/Proto/Queue/V1/QueueSendRequest.php
@@ -0,0 +1,115 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: queue/v1/queue.proto
+
+namespace Nitric\Proto\Queue\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Request to push a single event to a queue
+ *
+ * Generated from protobuf message <code>nitric.queue.v1.QueueSendRequest</code>
+ */
+class QueueSendRequest extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The Nitric name for the queue
+     * this will automatically be resolved to the provider specific queue identifier.
+     *
+     * Generated from protobuf field <code>string queue = 1;</code>
+     */
+    protected $queue = '';
+    /**
+     * The task to push to the queue
+     *
+     * Generated from protobuf field <code>.nitric.queue.v1.NitricTask task = 2;</code>
+     */
+    protected $task = null;
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $queue
+     *           The Nitric name for the queue
+     *           this will automatically be resolved to the provider specific queue identifier.
+     *     @type \Nitric\Proto\Queue\V1\NitricTask $task
+     *           The task to push to the queue
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Queue\V1\Queue::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The Nitric name for the queue
+     * this will automatically be resolved to the provider specific queue identifier.
+     *
+     * Generated from protobuf field <code>string queue = 1;</code>
+     * @return string
+     */
+    public function getQueue()
+    {
+        return $this->queue;
+    }
+
+    /**
+     * The Nitric name for the queue
+     * this will automatically be resolved to the provider specific queue identifier.
+     *
+     * Generated from protobuf field <code>string queue = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setQueue($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->queue = $var;
+
+        return $this;
+    }
+
+    /**
+     * The task to push to the queue
+     *
+     * Generated from protobuf field <code>.nitric.queue.v1.NitricTask task = 2;</code>
+     * @return \Nitric\Proto\Queue\V1\NitricTask|null
+     */
+    public function getTask()
+    {
+        return isset($this->task) ? $this->task : null;
+    }
+
+    public function hasTask()
+    {
+        return isset($this->task);
+    }
+
+    public function clearTask()
+    {
+        unset($this->task);
+    }
+
+    /**
+     * The task to push to the queue
+     *
+     * Generated from protobuf field <code>.nitric.queue.v1.NitricTask task = 2;</code>
+     * @param \Nitric\Proto\Queue\V1\NitricTask $var
+     * @return $this
+     */
+    public function setTask($var)
+    {
+        GPBUtil::checkMessage($var, \Nitric\Proto\Queue\V1\NitricTask::class);
+        $this->task = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Queue/V1/QueueSendResponse.php b/interfaces/Nitric/Proto/Queue/V1/QueueSendResponse.php
new file mode 100644
index 0000000..8026b23
--- /dev/null
+++ b/interfaces/Nitric/Proto/Queue/V1/QueueSendResponse.php
@@ -0,0 +1,33 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: queue/v1/queue.proto
+
+namespace Nitric\Proto\Queue\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Result of pushing a single task to a queue
+ *
+ * Generated from protobuf message <code>nitric.queue.v1.QueueSendResponse</code>
+ */
+class QueueSendResponse extends \Google\Protobuf\Internal\Message
+{
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Queue\V1\Queue::initOnce();
+        parent::__construct($data);
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Storage/V1/StorageClient.php b/interfaces/Nitric/Proto/Storage/V1/StorageClient.php
new file mode 100644
index 0000000..69298df
--- /dev/null
+++ b/interfaces/Nitric/Proto/Storage/V1/StorageClient.php
@@ -0,0 +1,65 @@
+<?php
+// GENERATED CODE -- DO NOT EDIT!
+
+namespace Nitric\Proto\Storage\V1;
+
+/**
+ * Services for storage and retrieval of files in the form of byte arrays, such as text and binary files.
+ */
+class StorageClient extends \Grpc\BaseStub {
+
+    /**
+     * @param string $hostname hostname
+     * @param array $opts channel options
+     * @param \Grpc\Channel $channel (optional) re-use channel object
+     */
+    public function __construct($hostname, $opts, $channel = null) {
+        parent::__construct($hostname, $opts, $channel);
+    }
+
+    /**
+     * Retrieve an item from a bucket
+     * @param \Nitric\Proto\Storage\V1\StorageReadRequest $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function Read(\Nitric\Proto\Storage\V1\StorageReadRequest $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/nitric.storage.v1.Storage/Read',
+        $argument,
+        ['\Nitric\Proto\Storage\V1\StorageReadResponse', 'decode'],
+        $metadata, $options);
+    }
+
+    /**
+     * Store an item to a bucket
+     * @param \Nitric\Proto\Storage\V1\StorageWriteRequest $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function Write(\Nitric\Proto\Storage\V1\StorageWriteRequest $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/nitric.storage.v1.Storage/Write',
+        $argument,
+        ['\Nitric\Proto\Storage\V1\StorageWriteResponse', 'decode'],
+        $metadata, $options);
+    }
+
+    /**
+     * Delete an item from a bucket
+     * @param \Nitric\Proto\Storage\V1\StorageDeleteRequest $argument input argument
+     * @param array $metadata metadata
+     * @param array $options call options
+     * @return \Grpc\UnaryCall
+     */
+    public function Delete(\Nitric\Proto\Storage\V1\StorageDeleteRequest $argument,
+      $metadata = [], $options = []) {
+        return $this->_simpleRequest('/nitric.storage.v1.Storage/Delete',
+        $argument,
+        ['\Nitric\Proto\Storage\V1\StorageDeleteResponse', 'decode'],
+        $metadata, $options);
+    }
+
+}
diff --git a/interfaces/Nitric/Proto/Storage/V1/StorageDeleteRequest.php b/interfaces/Nitric/Proto/Storage/V1/StorageDeleteRequest.php
new file mode 100644
index 0000000..43b1b7f
--- /dev/null
+++ b/interfaces/Nitric/Proto/Storage/V1/StorageDeleteRequest.php
@@ -0,0 +1,101 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: storage/v1/storage.proto
+
+namespace Nitric\Proto\Storage\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Request to delete a storage item
+ *
+ * Generated from protobuf message <code>nitric.storage.v1.StorageDeleteRequest</code>
+ */
+class StorageDeleteRequest extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * Name of the bucket to delete from
+     *
+     * Generated from protobuf field <code>string bucketName = 1;</code>
+     */
+    protected $bucketName = '';
+    /**
+     * Key of item to delete
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     */
+    protected $key = '';
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $bucketName
+     *           Name of the bucket to delete from
+     *     @type string $key
+     *           Key of item to delete
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Storage\V1\Storage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * Name of the bucket to delete from
+     *
+     * Generated from protobuf field <code>string bucketName = 1;</code>
+     * @return string
+     */
+    public function getBucketName()
+    {
+        return $this->bucketName;
+    }
+
+    /**
+     * Name of the bucket to delete from
+     *
+     * Generated from protobuf field <code>string bucketName = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setBucketName($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->bucketName = $var;
+
+        return $this;
+    }
+
+    /**
+     * Key of item to delete
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     * @return string
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+
+    /**
+     * Key of item to delete
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setKey($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->key = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Storage/V1/StorageDeleteResponse.php b/interfaces/Nitric/Proto/Storage/V1/StorageDeleteResponse.php
new file mode 100644
index 0000000..3bdff62
--- /dev/null
+++ b/interfaces/Nitric/Proto/Storage/V1/StorageDeleteResponse.php
@@ -0,0 +1,33 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: storage/v1/storage.proto
+
+namespace Nitric\Proto\Storage\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Result of deleting a storage item
+ *
+ * Generated from protobuf message <code>nitric.storage.v1.StorageDeleteResponse</code>
+ */
+class StorageDeleteResponse extends \Google\Protobuf\Internal\Message
+{
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Storage\V1\Storage::initOnce();
+        parent::__construct($data);
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Storage/V1/StorageReadRequest.php b/interfaces/Nitric/Proto/Storage/V1/StorageReadRequest.php
new file mode 100644
index 0000000..e607f6d
--- /dev/null
+++ b/interfaces/Nitric/Proto/Storage/V1/StorageReadRequest.php
@@ -0,0 +1,105 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: storage/v1/storage.proto
+
+namespace Nitric\Proto\Storage\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Request to retrieve a storage item
+ *
+ * Generated from protobuf message <code>nitric.storage.v1.StorageReadRequest</code>
+ */
+class StorageReadRequest extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * Nitric name of the bucket to retrieve from
+     *  this will be automatically resolved to the provider specific bucket identifier.
+     *
+     * Generated from protobuf field <code>string bucketName = 1;</code>
+     */
+    protected $bucketName = '';
+    /**
+     * Key of item to retrieve
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     */
+    protected $key = '';
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $bucketName
+     *           Nitric name of the bucket to retrieve from
+     *            this will be automatically resolved to the provider specific bucket identifier.
+     *     @type string $key
+     *           Key of item to retrieve
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Storage\V1\Storage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * Nitric name of the bucket to retrieve from
+     *  this will be automatically resolved to the provider specific bucket identifier.
+     *
+     * Generated from protobuf field <code>string bucketName = 1;</code>
+     * @return string
+     */
+    public function getBucketName()
+    {
+        return $this->bucketName;
+    }
+
+    /**
+     * Nitric name of the bucket to retrieve from
+     *  this will be automatically resolved to the provider specific bucket identifier.
+     *
+     * Generated from protobuf field <code>string bucketName = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setBucketName($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->bucketName = $var;
+
+        return $this;
+    }
+
+    /**
+     * Key of item to retrieve
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     * @return string
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+
+    /**
+     * Key of item to retrieve
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setKey($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->key = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Storage/V1/StorageReadResponse.php b/interfaces/Nitric/Proto/Storage/V1/StorageReadResponse.php
new file mode 100644
index 0000000..21da89f
--- /dev/null
+++ b/interfaces/Nitric/Proto/Storage/V1/StorageReadResponse.php
@@ -0,0 +1,67 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: storage/v1/storage.proto
+
+namespace Nitric\Proto\Storage\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Returned storage item
+ *
+ * Generated from protobuf message <code>nitric.storage.v1.StorageReadResponse</code>
+ */
+class StorageReadResponse extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * The body bytes of the retrieved storage item
+     *
+     * Generated from protobuf field <code>bytes body = 1;</code>
+     */
+    protected $body = '';
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $body
+     *           The body bytes of the retrieved storage item
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Storage\V1\Storage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * The body bytes of the retrieved storage item
+     *
+     * Generated from protobuf field <code>bytes body = 1;</code>
+     * @return string
+     */
+    public function getBody()
+    {
+        return $this->body;
+    }
+
+    /**
+     * The body bytes of the retrieved storage item
+     *
+     * Generated from protobuf field <code>bytes body = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setBody($var)
+    {
+        GPBUtil::checkString($var, False);
+        $this->body = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Storage/V1/StorageWriteRequest.php b/interfaces/Nitric/Proto/Storage/V1/StorageWriteRequest.php
new file mode 100644
index 0000000..6f91ccf
--- /dev/null
+++ b/interfaces/Nitric/Proto/Storage/V1/StorageWriteRequest.php
@@ -0,0 +1,139 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: storage/v1/storage.proto
+
+namespace Nitric\Proto\Storage\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Request to put (create/update) a storage item
+ *
+ * Generated from protobuf message <code>nitric.storage.v1.StorageWriteRequest</code>
+ */
+class StorageWriteRequest extends \Google\Protobuf\Internal\Message
+{
+    /**
+     * Nitric name of the bucket to store in
+     *  this will be automatically resolved to the provider specific bucket identifier.
+     *
+     * Generated from protobuf field <code>string bucketName = 1;</code>
+     */
+    protected $bucketName = '';
+    /**
+     * Key to store the item under
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     */
+    protected $key = '';
+    /**
+     * bytes array to store
+     *
+     * Generated from protobuf field <code>bytes body = 3;</code>
+     */
+    protected $body = '';
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     *     @type string $bucketName
+     *           Nitric name of the bucket to store in
+     *            this will be automatically resolved to the provider specific bucket identifier.
+     *     @type string $key
+     *           Key to store the item under
+     *     @type string $body
+     *           bytes array to store
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Storage\V1\Storage::initOnce();
+        parent::__construct($data);
+    }
+
+    /**
+     * Nitric name of the bucket to store in
+     *  this will be automatically resolved to the provider specific bucket identifier.
+     *
+     * Generated from protobuf field <code>string bucketName = 1;</code>
+     * @return string
+     */
+    public function getBucketName()
+    {
+        return $this->bucketName;
+    }
+
+    /**
+     * Nitric name of the bucket to store in
+     *  this will be automatically resolved to the provider specific bucket identifier.
+     *
+     * Generated from protobuf field <code>string bucketName = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setBucketName($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->bucketName = $var;
+
+        return $this;
+    }
+
+    /**
+     * Key to store the item under
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     * @return string
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+
+    /**
+     * Key to store the item under
+     *
+     * Generated from protobuf field <code>string key = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setKey($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->key = $var;
+
+        return $this;
+    }
+
+    /**
+     * bytes array to store
+     *
+     * Generated from protobuf field <code>bytes body = 3;</code>
+     * @return string
+     */
+    public function getBody()
+    {
+        return $this->body;
+    }
+
+    /**
+     * bytes array to store
+     *
+     * Generated from protobuf field <code>bytes body = 3;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setBody($var)
+    {
+        GPBUtil::checkString($var, False);
+        $this->body = $var;
+
+        return $this;
+    }
+
+}
+
diff --git a/interfaces/Nitric/Proto/Storage/V1/StorageWriteResponse.php b/interfaces/Nitric/Proto/Storage/V1/StorageWriteResponse.php
new file mode 100644
index 0000000..d546f52
--- /dev/null
+++ b/interfaces/Nitric/Proto/Storage/V1/StorageWriteResponse.php
@@ -0,0 +1,33 @@
+<?php
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: storage/v1/storage.proto
+
+namespace Nitric\Proto\Storage\V1;
+
+use Google\Protobuf\Internal\GPBType;
+use Google\Protobuf\Internal\RepeatedField;
+use Google\Protobuf\Internal\GPBUtil;
+
+/**
+ * Result of putting a storage item
+ *
+ * Generated from protobuf message <code>nitric.storage.v1.StorageWriteResponse</code>
+ */
+class StorageWriteResponse extends \Google\Protobuf\Internal\Message
+{
+
+    /**
+     * Constructor.
+     *
+     * @param array $data {
+     *     Optional. Data for populating the Message object.
+     *
+     * }
+     */
+    public function __construct($data = NULL) {
+        \GPBMetadata\Storage\V1\Storage::initOnce();
+        parent::__construct($data);
+    }
+
+}
+
diff --git a/src/Nitric/Faas/Context.php b/src/Nitric/Faas/Context.php
index e316a29..d9127f4 100644
--- a/src/Nitric/Faas/Context.php
+++ b/src/Nitric/Faas/Context.php
@@ -18,118 +18,88 @@
 
 namespace Nitric\Faas;
 
+use Nitric\Proto\Faas\V1\HttpTriggerContext;
+use Nitric\Proto\Faas\V1\TopicTriggerContext;
+use Nitric\Proto\Faas\V1\TriggerRequest;
+
 /**
- * Class Context represents the metadata of a FaaS request, including the source, payload type, unique request Id, etc.
+ * Class Context represents the metadata of a FaaS request
  * @package Nitric\Faas
  */
-class Context
+abstract class Context
 {
-    private string|null $requestID;
-    private string|null $source;
-    private string $sourceType;
-    private string|null $payloadType;
 
     /**
-     * Context constructor.
-     *
-     * @param string|null $requestID
-     * @param string|null $source
-     * @param string      $sourceType
-     * @param string|null $payloadType
+     * @return boolean
      */
-    public function __construct(
-        string|null $requestID,
-        string|null $source,
-        string $sourceType,
-        string|null $payloadType
-    ) {
-        $this->requestID = $requestID;
-        $this->source = $source;
-        $this->sourceType = SourceType::fromString($sourceType);
-        $this->payloadType = $payloadType;
-    }
-
-    private static function getValueIfExists($array, $key)
-    {
-        return isset($array[$key]) ? $array[$key][0] : null;
-    }
-
-    public static function fromHeaders(array $headers): Context
+    public function isTopic()
     {
-        $requestId = self::getValueIfExists($headers, "x-nitric-request-id");
-        $sourceType = self::getValueIfExists($headers, "x-nitric-source-type") ?: "UNKNOWN";
-        $source =  self::getValueIfExists($headers, "x-nitric-source");
-        $payloadType = self::getValueIfExists($headers, "x-nitric-payload-type");
-
-        return new Context(
-            $requestId,
-            $source,
-            $sourceType,
-            $payloadType
-        );
+        return $this instanceof TopicContext;
     }
 
     /**
-     * @return string
+     * @return boolean
      */
-    public function getRequestID(): string|null
+    public function isHttp()
     {
-        return $this->requestID;
+        return $this instanceof HttpContext;
     }
 
     /**
-     * @param string $requestID
+     * @return TopicContext
      */
-    public function setRequestID(string|null $requestID): void
+    public function asTopicContext()
     {
-        $this->requestID = $requestID;
+        if ($this instanceof TopicContext) {
+            return $this;
+        }
+        // Throw exception
     }
 
     /**
-     * @return string
+     * @return HttpContext
      */
-    public function getSource(): string|null
+    public function asHttpContext()
     {
-        return $this->source;
-    }
+        if ($this instanceof HttpContext) {
+            return $this;
+        }
 
-    /**
-     * @param string $source
-     */
-    public function setSource(string|null $source): void
-    {
-        $this->source = $source;
+        // Throw exception
     }
 
     /**
-     * @return string
+     * @return HttpContext
      */
-    public function getSourceType(): string
+    public static function fromHttpTriggerContext(HttpTriggerContext $context)
     {
-        return $this->sourceType;
-    }
-
-    /**
-     * @param string $sourceType
-     */
-    public function setSourceType(string $sourceType): void
-    {
-        $this->sourceType = SourceType::fromString($sourceType);
+        return new HttpContext(
+            $context->getMethod(),
+            (array) $context->getHeaders(),
+            (array) $context->getQueryParams(),
+            (array) $context->getPathParams()
+        );
     }
 
     /**
-     * @return string
+     * @return TopicContext
      */
-    public function getPayloadType(): string|null
+    public static function fromTopicTriggerContext(TopicTriggerContext $context)
     {
-        return $this->payloadType;
+        return new TopicContext(
+            $context->getTopic()
+        );
     }
 
     /**
-     * @param string $payloadType
+     * @return Context
      */
-    public function setPayloadType(string|null $payloadType): void
+    public static function fromTriggerRequest(TriggerRequest $request)
     {
-        $this->payloadType = $payloadType;
+        if ($request->hasHttp()) {
+            return Context::fromHttpTriggerContext($request->getHttp());
+        } elseif ($request->hasTopic()) {
+            return Context::fromTopicTriggerContext($request->getTopic());
+        }
     }
 }
diff --git a/src/Nitric/Faas/Faas.php b/src/Nitric/Faas/Faas.php
index 2c6cf08..595afca 100644
--- a/src/Nitric/Faas/Faas.php
+++ b/src/Nitric/Faas/Faas.php
@@ -18,25 +18,27 @@
 
 namespace Nitric\Faas;
 
-use Amp\Http\Server\RequestHandler\CallableRequestHandler;
-use Amp\Http\Server\HttpServer;
-use Amp\Http\Server\Request;
-use Amp\Http\Server\Response;
+use Amp\ByteStream\IteratorStream;
+use Amp\Http\Server\Driver\Client;
+use Grpc\ChannelCredentials;
 use Amp\Loop;
-use Amp\Socket\Server;
+use Amp\Parallel\Worker;
+use Amp\Producer;
+use Nitric\Proto\Faas\V1\FaasClient;
+use Nitric\Proto\Faas\V1\InitRequest;
+use Nitric\Proto\Faas\V1\ServerMessage;
+use Nitric\Proto\Faas\V1\ClientMessage;
 use Closure;
 
+use function Amp\call;
+
 /**
  * Function-as-a-Service (Faas) class provides method that assist in writing Serverless Functions, using PHP.
  * @package Nitric\Faas
  */
 class Faas
 {
-    /**
-     * Bind address for the FaaS service, defaults to "127.0.0.1:8080".
-     * Can be modified via CHILD_ADDRESS environment variable.
-     */
-    private const CHILD_ADDRESS = "CHILD_ADDRESS";
+    private const SERVICE_ADDRESS = "SERVICE_ADDRESS";
 
     /**
      * Begin handling FaaS triggers such as HTTP requests and Events.
@@ -47,63 +49,84 @@ class Faas
      */
     public static function start(Closure $handler)
     {
-        $address = getenv(self::CHILD_ADDRESS) ?: "127.0.0.1:8080";
+        $address = getenv(self::SERVICE_ADDRESS) ?: "127.0.0.1:50051";
 
-        Loop::run(
-            function () use ($handler, $address) {
-                $sockets = [
-                Server::listen($address),
-                ];
-
-                $server = new HttpServer(
-                    $sockets,
-                    new CallableRequestHandler(
-                        function (Request $request) use ($handler) {
-                            $body = yield $request->getBody()->buffer();
-
-                            // Convert HTTP Request to Nitric Request
-                            $nitricRequest = \Nitric\Faas\Request::fromHTTPRequest(
-                                $request->getHeaders(),
-                                $body,
-                                $request->getUri()->getPath()
-                            );
-
-                            // Call the handler function
-                            $nitricResponse = $handler($nitricRequest);
-
-                            // Return the Nitric Response as an HTTP Response
-                            return self::httpResponse($nitricResponse);
-                        }
-                    ),
-                    new Logger()
-                );
+        $opts = [
+            'credentials' => ChannelCredentials::createInsecure(),
+        ];
 
-                yield $server->start();
+        // TODO: Set credentials here...
+        $faasClient = new FaasClient($address, $opts);
+        $call = $faasClient->TriggerStream();
+        $init = new InitRequest();
+        // Write the InitRequest to connect
+        $msg = new ClientMessage();
+        $msg->setInitRequest($init);
+        $call->write($msg);
 
-                // Stop the server gracefully when SIGINT is received.
-                // This is technically optional, but it is best to call Server::stop().
+        Loop::run(
+            function () use ($call, $handler) {
                 Loop::onSignal(
                     SIGINT,
-                    function (string $watcherId) use ($server) {
+                    function (string $watcherId) use ($call) {
                         Loop::cancel($watcherId);
-                        yield $server->stop();
+                        // Cancel the gRPC stream
+                        $call->writesDone();
                     }
                 );
+
+                while (1) {
+                    // print("\nstarting read!\n");
+                    $readResult = yield call(array($call, 'read'));
+                    // print("\nGot request:\n");
+                    //print($readResult->serializeToJsonString());
+
+                    if ($readResult == null) {
+                        break;
+                    }
+
+                    if ($readResult instanceof ServerMessage) {
+                        if ($readResult->hasInitResponse()) {
+                            // We're one with the membrane
+                            // continue the loop and do nothing
+                            print("Function connected to membrane");
+                        } elseif ($readResult->hasTriggerRequest()) {
+                            // handle the trigger request
+                            $triggerRequest = $readResult->getTriggerRequest();
+                            $request = Request::fromTriggerRequest($triggerRequest);
+
+                            // Handle the userspace function
+                            $result = yield call($handler, $request);
+
+                            $triggerResponse = null;
+
+                            if ($result instanceof Response) {
+                                // Assume its a string
+                                $triggerResponse = $result->toTriggerResponse();
+                            } else {
+                                // Assume its a string
+                                $dataResult = (string) $result;
+
+                                $defaultResponse = $request->getDefaultResponse();
+                                $defaultResponse->setData($dataResult);
+
+                                $triggerResponse = $defaultResponse->toTriggerResponse();
+                            }
+
+                            $returnMsg = new ClientMessage();
+                            $returnMsg->setId($readResult->getId());
+                            $returnMsg->setTriggerResponse($triggerResponse);
+
+                            yield call(array($call, 'write'), $returnMsg);
+                            //yield $emit(".");
+                        } else {
+                            // Invalid message recieved
+                        }
+                    }
+                }
             }
         );
-    }
 
-    /**
-     * Convert a NitricResponse to a HTTP response. Used when the FaaS service is operating as an HTTP server.
-     * @param \Nitric\Faas\Response $response to be converted
-     * @return Response HTTP response representing the input response
-     */
-    private static function httpResponse(\Nitric\Faas\Response $response): Response
-    {
-        return new Response(
-            $response->getStatus(),
-            $response->getHeaders(),
-            $response->getBody()
-        );
+        //print("Exited loop :( \n");
     }
 }
diff --git a/src/Nitric/Faas/HttpContext.php b/src/Nitric/Faas/HttpContext.php
new file mode 100644
index 0000000..7d1eefa
--- /dev/null
+++ b/src/Nitric/Faas/HttpContext.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * Copyright 2021 Nitric Technologies Pty Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Nitric\Faas;
+
+use Nitric\Faas\Context;
+
+class HttpContext extends Context
+{
+    private string $method;
+    private array $headers;
+    private array $queryParams;
+    private array $pathParams;
+
+    public function __construct(
+        string $method,
+        array $headers,
+        array $queryParams,
+        array $pathParams
+    ) {
+        $this->method = $method;
+        $this->headers = $headers;
+        $this->queryParams = $queryParams;
+        $this->pathParams = $pathParams;
+    }
+
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+    public function getHeaders()
+    {
+        return $this->headers;
+    }
+
+    public function getQueryParams()
+    {
+        return $this->queryParams;
+    }
+
+    public function getPathParams()
+    {
+        return $this->pathParams;
+    }
+}
diff --git a/src/Nitric/Faas/HttpResponseContext.php b/src/Nitric/Faas/HttpResponseContext.php
new file mode 100644
index 0000000..03613da
--- /dev/null
+++ b/src/Nitric/Faas/HttpResponseContext.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Copyright 2021 Nitric Technologies Pty Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Nitric\Faas;
+
+use Nitric\Faas\ResponseContext;
+use Nitric\Proto\Faas\V1\HttpResponseContext as V1HttpResponseContext;
+
+class HttpResponseContext extends ResponseContext
+{
+    public array $headers = [];
+    public $status = 200;
+
+    public function __construct()
+    {
+    }
+
+    /**
+     * @return Nitric\Proto\Faas\V1\HttpResponseContext
+     */
+    public function toGrpcResponseContext()
+    {
+        $grpcContext = new V1HttpResponseContext();
+        $grpcContext->setHeaders($this->headers);
+        $grpcContext->setStatus($this->status);
+
+        return $grpcContext;
+    }
+}
diff --git a/src/Nitric/Faas/Request.php b/src/Nitric/Faas/Request.php
index c1746f8..b1471bd 100644
--- a/src/Nitric/Faas/Request.php
+++ b/src/Nitric/Faas/Request.php
@@ -18,6 +18,8 @@
 
 namespace Nitric\Faas;
 
+use Nitric\Proto\Faas\V1\TriggerRequest;
+
 /**
  * Class Request represents a normalized request in the Nitric runtime.
  * @package Nitric\Faas
@@ -25,8 +27,7 @@
 class Request
 {
     private Context $context;
-    private string $payload;
-    private string $path;
+    private string $data;
 
     /**
      * Request constructor.
@@ -35,30 +36,24 @@ class Request
      * @param string  $payload
      * @param string  $path
      */
-    public function __construct(Context $context, string $payload, string $path)
+    public function __construct(Context $context, string $data)
     {
         $this->context = $context;
-        $this->payload = $payload;
-        $this->path = $path;
+        $this->data = $data;
     }
 
-
     /**
-     * Return a Request from an HTTP request using standard conventions. Used when FaaS services is operating as
-     * an HTTP server.
-     * @param array $headers
-     * @param string $payload
-     * @param string $path
+     * Return a Request from an NitricTriggerRequest
+     * @param TriggerRequest $request
      * @return Request
      */
-    public static function fromHTTPRequest(array $headers, string $payload, string $path): Request
+    public static function fromTriggerRequest(TriggerRequest $request): Request
     {
-        $context = Context::fromHeaders($headers);
+        $context = Context::fromTriggerRequest($request);
 
         return new Request(
-            context:  $context,
-            payload: $payload,
-            path: $path
+            $context,
+            $request->getData()
         );
     }
 
@@ -70,43 +65,23 @@ public function getContext(): Context
         return $this->context;
     }
 
-    /**
-     * @param Context $context
-     */
-    public function setContext(Context $context): void
-    {
-        $this->context = $context;
-    }
-
     /**
      * @return string
      */
-    public function getPayload(): string
+    public function getData(): string
     {
-        return $this->payload;
+        return $this->data;
     }
 
-    /**
-     * @param string $payload
-     */
-    public function setPayload(string $payload): void
+    public function getDefaultResponse(): Response
     {
-        $this->payload = $payload;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPath(): string
-    {
-        return $this->path;
-    }
+        $response = new Response();
+        if ($this->context->isHttp()) {
+            $response->setContext(ResponseContext::http());
+        } elseif ($this->context->isTopic()) {
+            $response->setContext(ResponseContext::topic());
+        }
 
-    /**
-     * @param string $path
-     */
-    public function setPath(string $path): void
-    {
-        $this->path = $path;
+        return $response;
     }
 }
diff --git a/src/Nitric/Faas/Response.php b/src/Nitric/Faas/Response.php
index d0b5da9..44a1381 100644
--- a/src/Nitric/Faas/Response.php
+++ b/src/Nitric/Faas/Response.php
@@ -18,6 +18,11 @@
 
 namespace Nitric\Faas;
 
+use Nitric\Proto\Faas\V1\HttpResponseContext;
+use Nitric\Proto\Faas\V1\HttpTriggerContext;
+use Nitric\Proto\Faas\V1\TriggerRequest;
+use Nitric\Proto\Faas\V1\TriggerResponse;
+
 /**
  * Class Response represents a normalized response in the Nitric runtime. Will be converted to a specific response type
  * such as an HTTP response, depending on runtime environment.
@@ -25,72 +30,61 @@
  */
 class Response
 {
-    private string $body;
-    private int $status;
-    private array $headers;
+    private ResponseContext $context;
+    private string $data;
 
     /**
-     * @return string
+     * @return Response
      */
-    public function getBody(): string
+    public function setData(string $data): Response
     {
-        if ($this->body == null) {
-            return "";
-        }
-        return $this->body;
+        $this->data = $data;
+        return $this;
     }
 
     /**
-     * @param string $body
+     * @return Response
      */
-    public function setBody(string $body): void
+    public function setContext(ResponseContext $context): Response
     {
-        $this->body = $body;
+        $this->context = $context;
+        return $this;
     }
 
     /**
-     * @return int
+     * @return Response
      */
-    public function getStatus(): int
+    public function getContext(): ResponseContext
     {
-        return $this->status;
+        return $this->context;
     }
 
     /**
-     * @param int $status
+     * @return string
      */
-    public function setStatus(int $status): void
+    public function getData(): string
     {
-        $this->status = $status;
+        if ($this->data == null) {
+            return "";
+        }
+        return $this->data;
     }
 
-    /**
-     * @return string[]
-     */
-    public function getHeaders(): array
+    public function toTriggerResponse(): TriggerResponse
     {
-        return $this->headers;
-    }
+        $triggerResponse = new TriggerResponse();
+        $triggerResponse->setData($this->data);
 
-    /**
-     * @param array $headers
-     */
-    public function setHeaders(array $headers): void
-    {
-        $this->headers = $headers;
-    }
+        if ($this->context->isHttp()) {
+            $origContext = $this->getContext()->asHttp();
 
-    /**
-     * Response constructor.
-     *
-     * @param string $body
-     * @param int    $status
-     * @param array  $headers
-     */
-    public function __construct(string $body = "", int $status = 200, array $headers = [])
-    {
-        $this->body = $body;
-        $this->status = $status;
-        $this->headers = $headers;
+            $triggerResponse->setHttp($origContext->toGrpcResponseContext());
+        } elseif ($this->context->isTopic()) {
+            $origContext = $this->getContext()->asTopic();
+
+            $triggerResponse->setTopic($origContext->toGrpcResponseContext());
+        }
+
+        return $triggerResponse;
     }
 }
diff --git a/src/Nitric/Faas/ResponseContext.php b/src/Nitric/Faas/ResponseContext.php
new file mode 100644
index 0000000..d236549
--- /dev/null
+++ b/src/Nitric/Faas/ResponseContext.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * Copyright 2021 Nitric Technologies Pty Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Nitric\Faas;
+
+abstract class ResponseContext
+{
+
+    /**
+     * @return boolean
+     */
+    public function isHttp()
+    {
+        return $this instanceof HttpResponseContext;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function isTopic()
+    {
+        return $this instanceof TopicResponseContext;
+    }
+
+    /**
+     * @return HttpResponseContext
+     */
+    public function asHttp()
+    {
+        if ($this instanceof HttpResponseContext) {
+            return $this;
+        }
+    }
+
+    /**
+     * @return TopicResponseContext
+     */
+    public function asTopic()
+    {
+        if ($this instanceof TopicResponseContext) {
+            return $this;
+        }
+    }
+
+    /**
+     * @return HttpResponseContext
+     */
+    public static function http()
+    {
+        return new HttpResponseContext();
+    }
+
+    /**
+     * @return TopicResponseContext
+     */
+    public static function topic()
+    {
+        return new TopicResponseContext();
+    }
+}
diff --git a/src/Nitric/Faas/TopicContext.php b/src/Nitric/Faas/TopicContext.php
new file mode 100644
index 0000000..a89def7
--- /dev/null
+++ b/src/Nitric/Faas/TopicContext.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Copyright 2021 Nitric Technologies Pty Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Nitric\Faas;
+
+use Nitric\Faas\Context;
+
+class TopicContext extends Context
+{
+    private string $topic;
+
+    public function __construct(
+        string $topic
+    ) {
+        $this->topic = $topic;
+    }
+
+    public function getTopic()
+    {
+        return $this->topic;
+    }
+}
diff --git a/src/Nitric/Faas/TopicResponseContext.php b/src/Nitric/Faas/TopicResponseContext.php
new file mode 100644
index 0000000..f493134
--- /dev/null
+++ b/src/Nitric/Faas/TopicResponseContext.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Copyright 2021 Nitric Technologies Pty Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Nitric\Faas;
+
+use Nitric\Faas\ResponseContext;
+use Nitric\Proto\Faas\V1\TopicResponseContext as V1TopicResponseContext;
+
+class TopicResponseContext extends ResponseContext
+{
+    public $success = true;
+
+    public function __construct()
+    {
+    }
+
+    /**
+     * @return Nitric\Proto\Faas\V1\TopicResponseContext
+     */
+    public function toGrpcResponseContext()
+    {
+        $grpcContext = new V1TopicResponseContext();
+        $grpcContext->setSuccess($this->success);
+
+        return $grpcContext;
+    }
+}
diff --git a/tests/Nitric/Faas/ContextTest.php b/tests/Nitric/Faas/ContextTest.php
index 2394864..6d89c43 100644
--- a/tests/Nitric/Faas/ContextTest.php
+++ b/tests/Nitric/Faas/ContextTest.php
@@ -11,47 +11,6 @@ class ContextTest extends TestCase
 {
     public function testContextFromHeaders()
     {
-        $headers = [
-            "x-nitric-payload-type" => ["test payload type"],
-            "x-nitric-request-id" => ["test id"],
-            "x-nitric-source" => ["test source"],
-            "x-nitric-source-type" => ["REQUEST"]
-        ];
-        $context = Context::fromHeaders($headers);
-        $this->assertEquals("test payload type", $context->getPayloadType());
-        $this->assertEquals("test id", $context->getRequestID());
-        $this->assertEquals("test source", $context->getSource());
-        $this->assertEquals("REQUEST", $context->getSourceType());
-    }
-
-    public function testRequestSourceType()
-    {
-        $context = new Context("", "", "REQUEST", null);
-        $this->assertEquals(SourceType::REQUEST, $context->getSourceType());
-    }
-
-    public function testSubscriptionSourceType()
-    {
-        $context = new Context("", "", "SUBSCRIPTION", null);
-        $this->assertEquals(SourceType::SUBSCRIPTION, $context->getSourceType());
-    }
-
-    public function testUnknownSourceType()
-    {
-        $context = new Context("", "", "invalid source type", null);
-        $this->assertEquals(SourceType::UNKNOWN, $context->getSourceType());
-    }
-
-    public function testContextFromHeadersWithMissingKeys()
-    {
-        $headers = [
-            // x-nitric keys are missing.
-            "content-type" => ["text\/plain"]
-        ];
-        $context = Context::fromHeaders($headers);
-        $this->assertEquals(null, $context->getPayloadType());
-        $this->assertEquals(null, $context->getRequestID());
-        $this->assertEquals(null, $context->getSource());
-        $this->assertEquals("UNKNOWN", $context->getSourceType());
+        $this->assertTrue(true);
     }
 }