From 954e8141ddb5ccbb047118b8e34cbe1d83884fa8 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 8 Jun 2018 03:06:26 -0400
Subject: [PATCH] 1.1.4

---
 .idea/libraries/Dart_Packages.xml             |    1 +
 .idea/libraries/Dart_SDK.xml                  |    1 +
 ...with_query_params_in_routing_test_dart.xml |    8 +
 .../can_fetch_data_in_services_test_dart.xml  |    9 +
 .idea/workspace.xml                           | 1265 ++++++++---------
 CHANGELOG.md                                  |    5 +
 analysis_options.yaml                         |    5 +-
 example/json.dart                             |    3 +-
 lib/hooks.dart                                |   52 +-
 lib/src/core/angel_base.dart                  |   10 +-
 lib/src/core/hooked_service.dart              |  443 ++----
 lib/src/core/injection.dart                   |    9 +-
 lib/src/core/map_service.dart                 |   91 +-
 lib/src/core/request_context.dart             |   14 +-
 lib/src/core/response_context.dart            |   31 +-
 lib/src/core/routable.dart                    |   31 +-
 lib/src/core/server.dart                      |  118 +-
 lib/src/core/service.dart                     |   81 +-
 lib/src/http/angel_http.dart                  |  298 ++--
 lib/src/http/controller.dart                  |    9 +-
 lib/src/http/http.dart                        |    4 +-
 lib/src/http/http_request_context.dart        |   18 +-
 lib/src/http/http_response_context.dart       |    7 +-
 lib/src/stats/metric_server.dart              |    6 +-
 performance/hello/main.dart                   |   13 +-
 performance/hello/raw.dart                    |    2 +-
 pubspec.yaml                                  |    4 +-
 test/encoders_buffer_test.dart                |   31 +-
 test/exception_test.dart                      |   13 +-
 test/general_test.dart                        |    4 +-
 test/parameter_meta_test.dart                 |    3 +-
 test/precontained_test.dart                   |    6 +-
 test/primitives_test.dart                     |   16 +-
 test/repeat_request_test.dart                 |    8 +-
 test/routing_test.dart                        |   34 +-
 test/server_test.dart                         |   20 +-
 test/services_test.dart                       |   15 +-
 test/streaming_test.dart                      |   15 +-
 38 files changed, 1315 insertions(+), 1388 deletions(-)
 create mode 100644 .idea/runConfigurations/Match_routes__even_with_query_params_in_routing_test_dart.xml
 create mode 100644 .idea/runConfigurations/can_fetch_data_in_services_test_dart.xml

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index ad9897bb..fbbbfdf7 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -519,6 +519,7 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.13/lib" />
     </CLASSES>
     <JAVADOC />
+    <LIBRARY_FILE />
     <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml
index 2255dbd8..ed937c05 100644
--- a/.idea/libraries/Dart_SDK.xml
+++ b/.idea/libraries/Dart_SDK.xml
@@ -21,6 +21,7 @@
       <root url="file:///usr/local/opt/dart/libexec/lib/web_sql" />
     </CLASSES>
     <JAVADOC />
+    <LIBRARY_FILE />
     <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Match_routes__even_with_query_params_in_routing_test_dart.xml b/.idea/runConfigurations/Match_routes__even_with_query_params_in_routing_test_dart.xml
new file mode 100644
index 00000000..3df4dee3
--- /dev/null
+++ b/.idea/runConfigurations/Match_routes__even_with_query_params_in_routing_test_dart.xml
@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Match routes, even with query params in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
+    <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+    <option name="testName" value="Match routes, even with query params" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/can_fetch_data_in_services_test_dart.xml b/.idea/runConfigurations/can_fetch_data_in_services_test_dart.xml
new file mode 100644
index 00000000..5dbab496
--- /dev/null
+++ b/.idea/runConfigurations/can_fetch_data_in_services_test_dart.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="can fetch data in services_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/services_test.dart" />
+    <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+    <option name="testName" value="can fetch data" />
+    <option name="testRunnerOptions" value="-j 4" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 73da9b1a..df55ab7d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,44 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/Match_routes__even_with_query_params_in_routing_test_dart.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/can_fetch_data_in_services_test_dart.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/analysis_options.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/analysis_options.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/json.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/json.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/hooks.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/hooks.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/angel_base.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/angel_base.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/map_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/map_service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/routable.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/routable.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/performance/hello/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/performance/hello/main.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/performance/hello/raw.dart" beforeDir="false" afterPath="$PROJECT_DIR$/performance/hello/raw.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/exception_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/exception_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/general_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/general_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/precontained_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/precontained_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/primitives_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/primitives_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/repeat_request_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/repeat_request_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/services_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/services_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/streaming_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/streaming_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -27,36 +62,29 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="86">
-              <caret line="65" column="19" lean-forward="true" selection-start-line="65" selection-start-column="19" selection-end-line="65" selection-end-column="19" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="-1949">
+              <caret line="403" column="30" selection-start-line="403" selection-start-column="30" selection-end-line="403" selection-end-column="30" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <file leaf-file-name="raw.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="-61">
+              <caret line="7" column="31" lean-forward="true" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="131">
-              <caret line="26" column="65" lean-forward="true" selection-start-line="26" selection-start-column="65" selection-end-line="26" selection-end-column="65" />
-              <folding />
+            <state relative-caret-position="243">
+              <caret line="28" column="33" selection-start-line="28" selection-start-column="33" selection-end-line="28" selection-end-column="33" />
             </state>
           </provider>
         </entry>
@@ -64,8 +92,8 @@
       <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="196">
-              <caret line="120" column="26" lean-forward="false" selection-start-line="120" selection-start-column="26" selection-end-line="120" selection-end-column="26" />
+            <state relative-caret-position="363">
+              <caret line="162" column="32" lean-forward="true" selection-start-line="162" selection-start-column="32" selection-end-line="162" selection-end-column="32" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -73,52 +101,68 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
-              <caret line="201" column="37" lean-forward="false" selection-start-line="201" selection-start-column="37" selection-end-line="201" selection-end-column="37" />
-              <folding />
+            <state relative-caret-position="115">
+              <caret line="399" column="31" lean-forward="true" selection-start-line="399" selection-start-column="31" selection-end-line="399" selection-end-column="31" />
+              <folding>
+                <element signature="e#38#58#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.lock" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.lock">
+      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
+            <state relative-caret-position="100">
+              <caret line="51" column="34" lean-forward="true" selection-start-line="51" selection-start-column="34" selection-end-line="51" selection-end-column="34" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="travis.sh" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tool/travis.sh">
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
+            <state relative-caret-position="2275">
+              <caret line="229" column="26" selection-start-line="229" selection-start-column="26" selection-end-line="229" selection-end-column="26" />
+              <folding>
+                <element signature="e#39#59#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name=".travis.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.travis.yml">
+      <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/services_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="4" column="24" lean-forward="true" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
-              <folding />
+            <state relative-caret-position="186">
+              <caret line="102" column="6" selection-start-line="102" selection-start-column="6" selection-end-line="102" selection-end-column="6" />
+              <folding>
+                <element signature="e#0#54#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="30">
-              <caret line="2" column="66" lean-forward="true" selection-start-line="2" selection-start-column="66" selection-end-line="2" selection-end-column="66" />
-              <folding />
+            <state relative-caret-position="165">
+              <caret line="16" column="21" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="48">
+                <caret line="3" column="63" selection-start-line="3" selection-start-column="63" selection-end-line="3" selection-end-column="63" />
+              </first_editor>
+              <second_editor />
             </state>
           </provider>
         </entry>
@@ -135,28 +179,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>_isOpen</find>
-      <find>_isClosed</find>
-      <find>end</find>
-      <find>isOpen</find>
-      <find>_useStream</find>
-      <find>isClosed</find>
-      <find>HttpHeaders.</find>
-      <find>= false</find>
-      <find>= true</find>
-      <find>Future</find>
-      <find>toId</find>
-      <find>createZ</find>
-      <find>default</find>
-      <find>catch</find>
-      <find>error</find>
-      <find>trace</find>
-      <find>zonesp</find>
-      <find>runGuar</find>
-      <find>unca</find>
-      <find>async</find>
-      <find>hey</find>
-      <find>match</find>
       <find>getV</find>
       <find>zone</find>
       <find>zone.run</find>
@@ -165,11 +187,30 @@
       <find>statusCode</find>
       <find>.run</find>
       <find>var body = await rs.fold&lt;List&lt;int&gt;&gt;([], (out, list) =&gt; []..addAll(list));</find>
+      <find>async =</find>
+      <find>async {</find>
+      <find>await</find>
+      <find>e read(</find>
+      <find>for (var ha</find>
+      <find>geth</find>
+      <find>pip</find>
+      <find>close</find>
+      <find>sendFile</find>
+      <find>getHan</find>
+      <find>gethandle</find>
+      <find>BANG</find>
+      <find>execute</find>
+      <find>lazyBod</find>
+      <find>lazyBody()</find>
+      <find>addRout</find>
+      <find>lazyBody</find>
+      <find>_body = nu</find>
+      <find>_body</find>
+      <find>MID</find>
+      <find>beforeIndex</find>
+      <find>read(</find>
     </findStrings>
     <replaceStrings>
-      <replace>_isClosed</replace>
-      <replace>// _printDebug</replace>
-      <replace>create</replace>
       <replace>modify</replace>
       <replace>update</replace>
       <replace>remove</replace>
@@ -195,6 +236,11 @@
       <replace>'server'</replace>
       <replace>FutureOr</replace>
       <replace>var body = await getBody(rs);</replace>
+      <replace />
+      <replace>=</replace>
+      <replace>=</replace>
+      <replace>{</replace>
+      <replace />
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -202,6 +248,7 @@
       <dir>C:\Users\thosa\Source\Angel\framework\test</dir>
       <dir>$PROJECT_DIR$/lib/src</dir>
       <dir>$PROJECT_DIR$/test</dir>
+      <dir>$PROJECT_DIR$/lib/src/core</dir>
       <dir>$PROJECT_DIR$/lib</dir>
     </dirStrings>
   </component>
@@ -213,65 +260,60 @@
       </map>
     </option>
   </component>
-  <component name="GradleLocalSettings">
-    <option name="externalProjectsViewState">
-      <projects_view />
-    </option>
-  </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/util/forwarded_server.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/forwarded_server.dart" />
-        <option value="$PROJECT_DIR$/lib/src/util.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
-        <option value="$PROJECT_DIR$/test/all.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-        <option value="$PROJECT_DIR$/test/extension_test.dart" />
-        <option value="$PROJECT_DIR$/test/accepts_test.dart" />
-        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
-        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
-        <option value="$PROJECT_DIR$/test/general_test.dart" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
-        <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
-        <option value="$PROJECT_DIR$/test/precontained_test.dart" />
-        <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
         <option value="$PROJECT_DIR$/lib/angel_framework.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/response.dart" />
-        <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
-        <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/src/response.dart" />
-        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/test/server_test.dart" />
-        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/.travis.yml" />
         <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
+        <option value="$PROJECT_DIR$/analysis_options.yaml" />
+        <option value="$PROJECT_DIR$/lib/hooks.dart" />
+        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
+        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
+        <option value="$PROJECT_DIR$/test/precontained_test.dart" />
+        <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
+        <option value="$PROJECT_DIR$/example/json.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/test/general_test.dart" />
+        <option value="$PROJECT_DIR$/test/exception_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
+        <option value="$PROJECT_DIR$/performance/hello/raw.dart" />
+        <option value="$PROJECT_DIR$/example/main.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
+        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
+        <option value="$PROJECT_DIR$/test/services_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -281,9 +323,12 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
+  <component name="NodePackageJsonFileManager">
+    <packageJsonPaths />
+  </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="39" />
-    <option name="y" value="23" />
+    <option name="x" value="24" />
+    <option name="y" value="22" />
     <option name="width" value="1360" />
     <option name="height" value="797" />
   </component>
@@ -292,23 +337,9 @@
   </component>
   <component name="ProjectView">
     <navigator currentView="Scope" currentSubView="Project Files" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
-      <pane id="Scratches" />
-      <pane id="ProjectPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -319,32 +350,36 @@
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="tool" type="cbb8eebc:String" user="tool" />
+              <item name="performance/hello" type="cbb8eebc:String" user="performance/hello" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="ProjectPane" />
+      <pane id="AndroidView" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="options.lastSelected" value="preferences.externalResources" />
-    <property name="options.splitter.main.proportions" value="0.3" />
-    <property name="options.splitter.details.proportions" value="0.2" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_interpreter_path" value="C:/Program Files (x86)/nodejs/node" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="dart.analysis.tool.window.force.activate" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
-    <property name="js.eslint.eslintPackage" value="" />
-    <property name="js-jscs-nodeInterpreter" value="C:\Program Files (x86)\nodejs\node.exe" />
-    <property name="settings.editor.selected.configurable" value="dart.settings" />
-    <property name="restartRequiresConfirmation" value="false" />
+    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file:///Users/thosakwe/Source/Dart/framework/lib/src/http/request_context.dart" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+    <property name="dart.analysis.tool.window.force.activate" value="false" />
+    <property name="js-jscs-nodeInterpreter" value="C:\Program Files (x86)\nodejs\node.exe" />
+    <property name="js.eslint.eslintPackage" value="" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="nodejs_interpreter_path" value="node" />
+    <property name="options.lastSelected" value="preferences.externalResources" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="options.splitter.main.proportions" value="0.3" />
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file:///Users/thosakwe/Source/Dart/framework/lib/src/http/request_context.dart" />
+    <property name="restartRequiresConfirmation" value="false" />
+    <property name="settings.editor.selected.configurable" value="dart.settings" />
+    <property name="show.migrate.to.gradle.popup" value="false" />
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
@@ -365,96 +400,17 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests">
+  <component name="RunManager" selected="Dart Command Line App.performance::hello (PRODUCTION)">
+    <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
+      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+      <option name="testName" value="Can serialize function result as JSON" />
+    </configuration>
     <configuration name="Chained routes in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
       <option name="testName" value="Chained routes" />
     </configuration>
-    <configuration default="true" type="BashConfigurationType" factoryName="Bash">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="INTERPRETER_PATH" value="C:\Windows\system32\bash.exe" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="PARAMETERS" value="" />
-      <module name="" />
-      <envs />
-    </configuration>
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <gulpfile />
-      <tasks />
-      <arguments />
-      <envs />
-    </configuration>
-    <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
-      <method />
-    </configuration>
-    <configuration default="true" type="DartTestRunConfigurationType" factoryName="Dart Test">
-      <method />
-    </configuration>
-    <configuration default="true" type="FlutterRunConfigurationType" factoryName="Flutter">
-      <method />
-    </configuration>
-    <configuration default="true" type="JavaScriptTestRunnerJest" factoryName="Jest">
-      <node-interpreter value="project" />
-      <working-dir value="" />
-      <envs />
-      <scope-kind value="ALL" />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma">
-      <config-file value="" />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavaScriptTestRunnerProtractor" factoryName="Protractor">
-      <config-file value="" />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
-      <method />
-    </configuration>
-    <configuration default="true" type="LLVMCommandLineRunConfigurationType" factoryName="LLVM Application" show_console_on_std_err="false" show_console_on_std_out="false">
-      <option name="VMOptions" />
-      <option name="arguments" />
-      <option name="filePath" />
-      <method />
-    </configuration>
-    <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" working-dir="">
-      <method />
-    </configuration>
-    <configuration default="true" type="cucumber.js" factoryName="Cucumber.js">
-      <option name="cucumberJsArguments" value="" />
-      <option name="executablePath" />
-      <option name="filePath" />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
-      <command value="run" />
-      <scripts />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <working-directory />
-      <pass-parent-env>true</pass-parent-env>
-      <envs />
-      <ui />
-      <extra-mocha-options />
-      <test-kind>DIRECTORY</test-kind>
-      <test-directory />
-      <recursive>false</recursive>
-      <method />
-    </configuration>
     <configuration name="can create data in services_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/services_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -492,11 +448,16 @@
       <option name="testName" value="global injection added to injection map" />
       <option name="testRunnerOptions" value="-j 4" />
     </configuration>
-    <configuration name="handleAngelHttpException in server_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" temporary="true" nameIsGenerated="true">
+    <configuration name="handleAngelHttpException in server_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/server_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
       <option name="testName" value="handleAngelHttpException" />
     </configuration>
+    <configuration name="listen before and after in hooked_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/hooked_test.dart" />
+      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+      <option name="testName" value="listen before and after" />
+    </configuration>
     <configuration name="middleware in controller_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/controller_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -555,58 +516,86 @@
       <option name="filePath" value="$PROJECT_DIR$/test/typed_service_test.dart" />
       <option name="testName" value="typed_service_test.dart" />
     </configuration>
-    <list size="42">
-      <item index="0" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (DEV)" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (PRODUCTION)" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Command Line App.main.dart" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Test.tests in extension_test.dart" />
-      <item index="7" class="java.lang.String" itemvalue="Dart Test.global injection added to injection map in server_test.dart" />
-      <item index="8" class="java.lang.String" itemvalue="Dart Test.middleware in controller_test.dart" />
-      <item index="9" class="java.lang.String" itemvalue="Dart Test.injects header or throws in parameter_meta_test.dart" />
-      <item index="10" class="java.lang.String" itemvalue="Dart Test.injects session or throws in parameter_meta_test.dart" />
-      <item index="11" class="java.lang.String" itemvalue="Dart Test.tests in parameter_meta_test.dart" />
-      <item index="12" class="java.lang.String" itemvalue="Dart Test.Chained routes in routing_test.dart" />
-      <item index="13" class="java.lang.String" itemvalue="Dart Test.only match route with matching method in routing_test.dart" />
-      <item index="14" class="java.lang.String" itemvalue="Dart Test.only uses one encoder in encoders_buffer_test.dart" />
-      <item index="15" class="java.lang.String" itemvalue="Dart Test.can send html in server_test.dart" />
-      <item index="16" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
-      <item index="17" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
-      <item index="18" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
-      <item index="19" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
-      <item index="20" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
-      <item index="21" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
-      <item index="22" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
-      <item index="23" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
-      <item index="24" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
-      <item index="25" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
-      <item index="26" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
-      <item index="27" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
-      <item index="28" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
-      <item index="29" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
-      <item index="30" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="31" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="32" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="33" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="34" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="35" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
-      <item index="36" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="37" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
-      <item index="38" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
-      <item index="39" class="java.lang.String" itemvalue="Dart Test.tests in framework" />
-      <item index="40" class="java.lang.String" itemvalue="Dart Test.encoding in encoders_buffer_test.dart" />
-      <item index="41" class="java.lang.String" itemvalue="Dart Test.handleAngelHttpException in server_test.dart" />
+    <configuration default="true" type="BashConfigurationType" factoryName="Bash">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="INTERPRETER_PATH" value="C:\Windows\system32\bash.exe" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SCRIPT_NAME" value="" />
+      <option name="PARAMETERS" value="" />
+      <module name="" />
+      <envs />
+    </configuration>
+    <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma">
+      <config-file value="" />
+      <node-interpreter value="project" />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="cucumber.js" factoryName="Cucumber.js">
+      <option name="cucumberJsArguments" value="" />
+      <option name="executablePath" />
+      <option name="filePath" />
+      <method />
+    </configuration>
+    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <gulpfile />
+      <tasks />
+      <arguments />
+      <envs />
+    </configuration>
+    <list>
+      <item itemvalue="Dart Test.Can serialize function result as JSON in routing_test.dart" />
+      <item itemvalue="Dart Test.Match routes, even with query params in routing_test.dart" />
+      <item itemvalue="Dart Test.listen before and after in hooked_test.dart" />
+      <item itemvalue="Dart Command Line App.performance::hello (DEV)" />
+      <item itemvalue="Dart Command Line App.performance::hello (PRODUCTION)" />
+      <item itemvalue="Dart Command Line App.All Tests (for coverage)" />
+      <item itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
+      <item itemvalue="Dart Command Line App.performance::hello::raw" />
+      <item itemvalue="Dart Command Line App.main.dart" />
+      <item itemvalue="Dart Test.tests in extension_test.dart" />
+      <item itemvalue="Dart Test.global injection added to injection map in server_test.dart" />
+      <item itemvalue="Dart Test.middleware in controller_test.dart" />
+      <item itemvalue="Dart Test.injects header or throws in parameter_meta_test.dart" />
+      <item itemvalue="Dart Test.injects session or throws in parameter_meta_test.dart" />
+      <item itemvalue="Dart Test.tests in parameter_meta_test.dart" />
+      <item itemvalue="Dart Test.Chained routes in routing_test.dart" />
+      <item itemvalue="Dart Test.only match route with matching method in routing_test.dart" />
+      <item itemvalue="Dart Test.only uses one encoder in encoders_buffer_test.dart" />
+      <item itemvalue="Dart Test.can send html in server_test.dart" />
+      <item itemvalue="Dart Test.tests in primitives_test.dart" />
+      <item itemvalue="Dart Test.tests in repeat_request_test.dart" />
+      <item itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
+      <item itemvalue="Dart Test.tests in streaming_test.dart" />
+      <item itemvalue="Dart Test.can create data in services_test.dart" />
+      <item itemvalue="Dart Test.can delete data in services_test.dart" />
+      <item itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
+      <item itemvalue="Dart Test.tests in accepts_test.dart" />
+      <item itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
+      <item itemvalue="Dart Test.tests in server_test.dart" />
+      <item itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item itemvalue="Dart Test.tests in exception_test.dart" />
+      <item itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item itemvalue="Dart Test.Controller Tests" />
+      <item itemvalue="Dart Test.DI Tests" />
+      <item itemvalue="Dart Test.Hooked Tests" />
+      <item itemvalue="Dart Test.Routing Tests" />
+      <item itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
+      <item itemvalue="Dart Test.All Tests" />
+      <item itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
+      <item itemvalue="Dart Test.tests in framework" />
+      <item itemvalue="Dart Test.encoding in encoders_buffer_test.dart" />
+      <item itemvalue="Dart Test.handleAngelHttpException in server_test.dart" />
+      <item itemvalue="Dart Test.can fetch data in services_test.dart" />
     </list>
-    <recent_temporary>
-      <list size="1">
-        <item index="0" class="java.lang.String" itemvalue="Dart Test.handleAngelHttpException in server_test.dart" />
-      </list>
-    </recent_temporary>
   </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
+  <component name="SvnConfiguration">
+    <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
@@ -679,14 +668,9 @@
       <workItem from="1522434729364" duration="100000" />
       <workItem from="1523041434716" duration="3254000" />
       <workItem from="1526435792950" duration="2668000" />
-      <workItem from="1526439485584" duration="1192000" />
-    </task>
-    <task id="LOCAL-00034" summary="Logging support">
-      <created>1506092029287</created>
-      <option name="number" value="00034" />
-      <option name="presentableId" value="LOCAL-00034" />
-      <option name="project" value="LOCAL" />
-      <updated>1506092029287</updated>
+      <workItem from="1526439485584" duration="1904000" />
+      <workItem from="1528385352077" duration="29000" />
+      <workItem from="1528432209488" duration="9138000" />
     </task>
     <task id="LOCAL-00035" summary="Updated `use`">
       <created>1506092171442</created>
@@ -1024,43 +1008,50 @@
       <option name="project" value="LOCAL" />
       <updated>1526440469836</updated>
     </task>
-    <option name="localTasksCounter" value="83" />
+    <task id="LOCAL-00083" summary="1.1.3">
+      <created>1526440683707</created>
+      <option name="number" value="00083" />
+      <option name="presentableId" value="LOCAL-00083" />
+      <option name="project" value="LOCAL" />
+      <updated>1526440683707</updated>
+    </task>
+    <option name="localTasksCounter" value="84" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2018.05.15 at 23h 10m 38s.xml">
+    <history-entry file="All_Tests - 2018.06.08 at 02h 50m 09s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2018.05.15 at 23h 13m 46s.xml">
+    <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 52m 00s.xml">
+      <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 52m 19s.xml">
+      <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 52m 29s.xml">
+      <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 53m 25s.xml">
+      <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 54m 45s.xml">
+      <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="All_Tests - 2018.06.08 at 02h 54m 57s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 09m 49s.xml">
-      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="can_delete_data_in_services_test_dart - 2018.06.08 at 02h 55m 21s.xml">
+      <configuration name="can delete data in services_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 09m 58s.xml">
-      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="can_delete_data_in_services_test_dart - 2018.06.08 at 02h 55m 49s.xml">
+      <configuration name="can delete data in services_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 10m 08s.xml">
-      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 10m 12s.xml">
-      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 10m 16s.xml">
-      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 11m 21s.xml">
-      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="tests_in_encoders_buffer_test_dart - 2018.05.15 at 23h 11m 31s.xml">
-      <configuration name="tests in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="tests_in_encoders_buffer_test_dart - 2018.05.15 at 23h 13m 34s.xml">
-      <configuration name="tests in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2018.06.08 at 02h 56m 02s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="134986000" />
+    <option name="totallyTimeSpent" value="144865000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1072,43 +1063,47 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="39" y="23" width="1360" height="797" extended-state="0" />
+    <frame x="24" y="22" width="1360" height="797" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962063" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3988604" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3233618" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="bottom" id="Tool Output" order="7" />
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" />
+      <window_info anchor="right" id="Maven Projects" order="3" />
+      <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31142858" />
+      <window_info anchor="right" id="Flutter Outline" order="4" />
+      <window_info id="Capture Tool" order="2" />
+      <window_info id="Designer" order="2" />
+      <window_info anchor="right" id="Database" order="3" />
+      <window_info anchor="bottom" id="ANTLR Preview" order="7" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.24962063" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info id="UI Designer" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.32763532" />
+      <window_info anchor="bottom" id="Messages" order="7" visible="true" weight="0.32285714" />
+      <window_info anchor="right" id="Palette&#9;" order="3" />
+      <window_info id="Image Layers" order="2" />
+      <window_info anchor="right" id="Capture Analysis" order="3" />
+      <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.40142858" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.48" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23748103" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
+      <window_info anchor="right" id="SciView" order="4" />
+      <window_info anchor="right" id="Theme Preview" order="3" />
+      <window_info id="Favorites" order="3" side_tool="true" />
+      <window_info anchor="right" id="Flutter Inspector" order="4" />
+      <window_info anchor="bottom" id="DB Execution Console" order="8" />
+      <window_info anchor="right" id="Coverage" order="3" side_tool="true" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info id="DB Browser" order="2" weight="0.32998413" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Data View" order="4" />
+      <window_info anchor="bottom" id="Message" order="0" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1119,7 +1114,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Removed use of `HttpHeaders` in `Angel`" />
     <MESSAGE value="Deprecated createZoneForRequest" />
     <MESSAGE value="Deprecated `ServerGenerator`" />
     <MESSAGE value="Updated tests to use `AngelHttp` API" />
@@ -1144,297 +1138,267 @@
     <MESSAGE value="Update example" />
     <MESSAGE value="Use dart2_constant" />
     <MESSAGE value="Fixed all broken tests" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fixed all broken tests" />
+    <MESSAGE value="1.1.3" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.1.3" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="5" />
+      <option name="time" value="6" />
     </breakpoint-manager>
-    <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
+    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.travis.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="20" column="36" lean-forward="true" selection-start-line="20" selection-start-column="36" selection-end-line="20" selection-end-column="36" />
+        <state relative-caret-position="64">
+          <caret line="4" column="24" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+    <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="29" column="31" lean-forward="true" selection-start-line="29" selection-start-column="31" selection-end-line="29" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="33" column="0" lean-forward="true" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/repeat_request_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="12" column="55" lean-forward="false" selection-start-line="12" selection-start-column="55" selection-end-line="12" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/request.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="108" column="9" lean-forward="false" selection-start-line="108" selection-start-column="9" selection-end-line="108" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="16" column="27" lean-forward="true" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="18" column="36" lean-forward="true" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="302">
-          <caret line="107" column="19" lean-forward="true" selection-start-line="107" selection-start-column="19" selection-end-line="107" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core.dart" />
-    <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="26" lean-forward="false" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="675">
-          <caret line="45" column="54" lean-forward="false" selection-start-line="45" selection-start-column="54" selection-end-line="45" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="212">
-          <caret line="231" column="35" lean-forward="false" selection-start-line="231" selection-start-column="35" selection-end-line="231" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="52" lean-forward="false" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="158">
-          <caret line="104" column="46" lean-forward="true" selection-start-line="104" selection-start-column="46" selection-end-line="104" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="27" lean-forward="true" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="27" lean-forward="false" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="28" lean-forward="true" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="28" lean-forward="true" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
+        <state relative-caret-position="133">
+          <caret line="58" column="9" lean-forward="true" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="9" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="227">
-          <caret line="26" column="78" lean-forward="false" selection-start-line="26" selection-start-column="78" selection-end-line="26" selection-end-column="78" />
+        <state relative-caret-position="256">
+          <caret line="17" column="19" lean-forward="true" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="18" column="50" lean-forward="true" selection-start-line="18" selection-start-column="50" selection-end-line="18" selection-end-column="50" />
+        <state relative-caret-position="160">
+          <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/response.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="318">
-          <caret line="99" column="11" lean-forward="false" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="11" />
+        <state relative-caret-position="240">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/mock_request.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="16" lean-forward="true" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="16" />
+        <state relative-caret-position="1600">
+          <caret line="104" column="46" lean-forward="true" selection-start-line="104" selection-start-column="46" selection-end-line="104" selection-end-column="46" />
         </state>
       </provider>
     </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/future.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/stats/stats.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="659" column="12" lean-forward="false" selection-start-line="659" selection-start-column="12" selection-end-line="659" selection-end-column="12" />
-        </state>
+        <state relative-caret-position="-394" />
       </provider>
     </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/zone.dart">
+    <entry file="file://$PROJECT_DIR$/analysis_options.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="389">
-          <caret line="222" column="19" lean-forward="false" selection-start-line="222" selection-start-column="19" selection-end-line="222" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="15" lean-forward="false" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1395">
-          <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
-          <folding>
-            <element signature="e#39#59#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="25" column="18" lean-forward="true" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="406" column="11" lean-forward="false" selection-start-line="406" selection-start-column="11" selection-end-line="406" selection-end-column="11" />
+        <state relative-caret-position="64">
+          <caret line="4" column="25" selection-start-line="4" selection-start-column="25" selection-end-line="4" selection-end-column="25" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="302">
-          <caret line="105" column="31" lean-forward="true" selection-start-line="105" selection-start-column="31" selection-end-line="105" selection-end-column="31" />
+        <state relative-caret-position="131">
+          <caret line="96" column="4" selection-start-line="96" selection-start-column="4" selection-end-line="96" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="41" column="38" selection-start-line="41" selection-start-column="38" selection-end-line="41" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="28" lean-forward="true" selection-start-column="28" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-442">
+          <caret line="137" column="29" selection-start-line="137" selection-start-column="29" selection-end-line="137" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="16">
+          <caret line="1" column="28" selection-start-line="1" selection-start-column="28" selection-end-line="1" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="116">
+          <caret line="88" column="47" selection-start-line="88" selection-start-column="47" selection-end-line="88" selection-end-column="47" />
           <folding>
-            <element signature="e#0#20#0" expanded="false" />
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
+          <folding>
+            <element signature="e#0#54#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="28" selection-start-column="28" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/repeat_request_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="169">
+          <caret line="17" column="49" selection-start-line="17" selection-start-column="49" selection-end-line="17" selection-end-column="49" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/example/json.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="151">
-          <caret line="36" column="24" lean-forward="true" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" />
+        <state>
+          <caret column="20" selection-start-column="20" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="360">
+          <caret line="126" column="30" selection-start-line="126" selection-start-column="30" selection-end-line="126" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="122">
+          <caret line="58" column="26" selection-start-line="58" selection-start-column="26" selection-end-line="58" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="44" column="6" selection-start-line="44" selection-start-column="6" selection-end-line="44" selection-end-column="6" />
           <folding>
-            <element signature="e#0#20#0" expanded="false" />
+            <element signature="e#40#60#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="660">
-            <caret line="44" column="1" lean-forward="false" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
-            <folding>
-              <marker date="1523044571000" expanded="true" signature="588:1671" ph="{...}" />
-            </folding>
-          </first_editor>
-          <second_editor />
+    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="313">
+          <caret line="34" column="15" selection-start-line="34" selection-start-column="15" selection-end-line="34" selection-end-column="15" />
+          <folding>
+            <element signature="e#1#18#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+    <entry file="file:///usr/local/opt/dart/libexec/lib/_http/http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="765">
-          <caret line="51" column="28" lean-forward="false" selection-start-line="51" selection-start-column="28" selection-end-line="51" selection-end-column="28" />
+        <state relative-caret-position="154">
+          <caret line="2027" column="23" lean-forward="true" selection-start-line="2027" selection-start-column="23" selection-end-line="2027" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="108">
+          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="15" column="27" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="27" />
+          <folding>
+            <element signature="e#48#68#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="43" column="52" selection-start-line="43" selection-start-column="52" selection-end-line="43" selection-end-column="52" />
           <folding>
             <element signature="e#0#17#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="3" column="46" lean-forward="false" selection-start-line="3" selection-start-column="46" selection-end-line="3" selection-end-column="46" />
-          <folding />
+        <state relative-caret-position="109">
+          <caret line="64" column="24" lean-forward="true" selection-start-line="64" selection-start-column="24" selection-end-line="64" selection-end-column="24" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="255">
-            <caret line="15" column="66" lean-forward="false" selection-start-line="15" selection-start-column="66" selection-end-line="15" selection-end-column="66" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.50.0/libexec/lib/io/io_sink.dart">
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.1.0/lib/src/parse_body.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="77" column="5" lean-forward="true" selection-start-line="77" selection-start-column="5" selection-end-line="77" selection-end-column="5" />
-          <folding />
+        <state relative-caret-position="96">
+          <caret line="14" column="29" selection-start-line="13" selection-start-column="40" selection-end-line="20" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.50.0/libexec/lib/async/zone.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="71" column="38" selection-start-line="71" selection-start-column="38" selection-end-line="71" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="79">
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="179">
+          <caret line="119" column="40" selection-start-line="119" selection-start-column="40" selection-end-line="119" selection-end-column="40" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/opt/dart/libexec/lib/async/async.dart">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
-          <caret line="10" column="61" lean-forward="true" selection-start-line="10" selection-start-column="61" selection-end-line="10" selection-end-column="61" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/src/response.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="851">
-          <caret line="95" column="20" lean-forward="false" selection-start-line="95" selection-start-column="20" selection-end-line="95" selection-end-column="20" />
+          <caret line="29" column="27" lean-forward="true" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
@@ -1443,111 +1407,138 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="26" column="65" lean-forward="true" selection-start-line="26" selection-start-column="65" selection-end-line="26" selection-end-column="65" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="116">
-          <caret line="58" column="25" lean-forward="true" selection-start-line="58" selection-start-column="25" selection-end-line="58" selection-end-column="25" />
-          <folding />
+        <state relative-caret-position="187">
+          <caret line="21" column="15" lean-forward="true" selection-start-line="21" selection-start-column="15" selection-end-line="21" selection-end-column="15" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="191">
-          <caret line="73" column="35" lean-forward="true" selection-start-line="73" selection-start-column="35" selection-end-line="73" selection-end-column="35" />
-          <folding />
+        <state relative-caret-position="-742">
+          <caret line="10" column="15" lean-forward="true" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/mock_request.dart">
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.36/lib/src/frontend/expect.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="19" lean-forward="false" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
-          <folding />
+        <state relative-caret-position="387">
+          <caret line="164" column="29" selection-start-line="164" selection-start-column="29" selection-end-line="164" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="86">
-          <caret line="65" column="19" lean-forward="true" selection-start-line="65" selection-start-column="19" selection-end-line="65" selection-end-column="19" />
+        <state relative-caret-position="131">
+          <caret line="183" column="2" selection-start-line="183" selection-start-column="2" selection-end-line="183" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="399" column="31" lean-forward="true" selection-start-line="399" selection-start-column="31" selection-end-line="399" selection-end-column="31" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="100">
+          <caret line="51" column="34" lean-forward="true" selection-start-line="51" selection-start-column="34" selection-end-line="51" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="131">
+          <caret line="67" column="45" selection-start-line="67" selection-start-column="45" selection-end-line="67" selection-end-column="45" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="102" column="6" selection-start-line="102" selection-start-column="6" selection-end-line="102" selection-end-column="6" />
+          <folding>
+            <element signature="e#0#54#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2275">
+          <caret line="229" column="26" selection-start-line="229" selection-start-column="26" selection-end-line="229" selection-end-column="26" />
+          <folding>
+            <element signature="e#39#59#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1949">
+          <caret line="403" column="30" selection-start-line="403" selection-start-column="30" selection-end-line="403" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-61">
+          <caret line="7" column="31" lean-forward="true" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="16" column="59" lean-forward="true" selection-start-line="16" selection-start-column="59" selection-end-line="16" selection-end-column="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.59.0/libexec/lib/async/future.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="631">
+          <caret line="666" column="12" selection-start-line="666" selection-start-column="12" selection-end-line="666" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="196">
-          <caret line="120" column="26" lean-forward="false" selection-start-line="120" selection-start-column="26" selection-end-line="120" selection-end-column="26" />
+        <state relative-caret-position="363">
+          <caret line="162" column="32" lean-forward="true" selection-start-line="162" selection-start-column="32" selection-end-line="162" selection-end-column="32" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="201" column="37" lean-forward="false" selection-start-line="201" selection-start-column="37" selection-end-line="201" selection-end-column="37" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.lock">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.travis.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="24" lean-forward="true" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="58" column="9" lean-forward="true" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="9" />
-          <folding />
+        <state relative-caret-position="243">
+          <caret line="28" column="33" selection-start-line="28" selection-start-column="33" selection-end-line="28" selection-end-column="33" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="66" lean-forward="true" selection-start-line="2" selection-start-column="66" selection-end-line="2" selection-end-column="66" />
-          <folding />
+        <state relative-caret-position="165">
+          <caret line="16" column="21" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="48">
+            <caret line="3" column="63" selection-start-line="3" selection-start-column="63" selection-end-line="3" selection-end-column="63" />
+          </first_editor>
+          <second_editor />
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dad1665..7ecac991 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 1.1.4
+* Remove all usages of `async`/`await` in the core library.
+* `AngelConfigurer` now accepts `FutureOr`.
+* `AngelHttp` now has a `useZone` flag to disable custom zones.
+
 # 1.1.3
 * `AngelHttp` now handles requests in a `Zone`.
 * Use `package:dart2_constant`.
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 518eb901..1167d894 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,2 +1,5 @@
 analyzer:
-  strong-mode: true
\ No newline at end of file
+  strong-mode: true
+linter:
+  rules:
+    - avoid_slow_async_io
\ No newline at end of file
diff --git a/example/json.dart b/example/json.dart
index 1ab77456..27426ba9 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 import 'dart:isolate';
 import 'package:dart2_constant/convert.dart';
 import 'package:angel_framework/angel_framework.dart';
@@ -48,6 +47,6 @@ serverMain(_) async {
     print(e.stackTrace);
   };
 
-  var server = await http.startServer(InternetAddress.LOOPBACK_IP_V4, 3000);
+  var server = await http.startServer('127.0.0.1', 3000);
   print('Listening at http://${server.address.address}:${server.port}');
 }
diff --git a/lib/hooks.dart b/lib/hooks.dart
index 13c18a3d..bcce6141 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -9,19 +9,19 @@ import 'angel_framework.dart';
 /// Sequentially runs a set of [listeners].
 HookedServiceEventListener chainListeners(
     Iterable<HookedServiceEventListener> listeners) {
-  return (HookedServiceEvent e) async {
-    for (HookedServiceEventListener listener in listeners) await listener(e);
+  return (HookedServiceEvent e) {
+    for (HookedServiceEventListener listener in listeners) listener(e);
   };
 }
 
 /// Runs a [callback] on every service, and listens for future services to run it again.
 AngelConfigurer hookAllServices(callback(Service service)) {
-  return (Angel app) async {
+  return (Angel app) {
     List<Service> touched = [];
 
     for (var service in app.services.values) {
       if (!touched.contains(service)) {
-        await callback(service);
+        callback(service);
         touched.add(service);
       }
     }
@@ -52,9 +52,9 @@ HookedServiceEventListener transform(transformer(obj), [condition]) {
   Iterable cond = condition is Iterable ? condition : [condition];
   if (condition == null) cond = [];
 
-  _condition(HookedServiceEvent e, condition) async {
+  _condition(HookedServiceEvent e, condition) {
     if (condition is Function)
-      return await condition(e);
+      return condition(e);
     else if (condition == Providers)
       return true;
     else {
@@ -70,11 +70,11 @@ HookedServiceEventListener transform(transformer(obj), [condition]) {
     }
   }
 
-  normalize(HookedServiceEvent e, obj) async {
+  normalize(HookedServiceEvent e, obj) {
     bool transform = true;
 
     for (var c in cond) {
-      var r = await _condition(e, c);
+      var r = _condition(e, c);
 
       if (r != true) {
         transform = false;
@@ -97,7 +97,7 @@ HookedServiceEventListener transform(transformer(obj), [condition]) {
       var r = [];
 
       for (var o in obj) {
-        r.add(await normalize(e, o));
+        r.add(normalize(e, o));
       }
 
       return r;
@@ -105,10 +105,10 @@ HookedServiceEventListener transform(transformer(obj), [condition]) {
       return transformer(obj);
   }
 
-  return (HookedServiceEvent e) async {
+  return (HookedServiceEvent e) {
     if (e.isBefore) {
-      e.data = await normalize(e, e.data);
-    } else if (e.isAfter) e.result = await normalize(e, e.result);
+      e.data = normalize(e, e.data);
+    } else if (e.isAfter) e.result = normalize(e, e.result);
   };
 }
 
@@ -135,7 +135,7 @@ HookedServiceEventListener toType(Type type) {
 /// Only applies to the client-side.
 HookedServiceEventListener remove(key, [remover(key, obj)]) {
   return (HookedServiceEvent e) async {
-    _remover(key, obj) {
+    _remover(key, obj) async {
       if (remover != null)
         return remover(key, obj);
       else if (obj is List)
@@ -171,15 +171,15 @@ HookedServiceEventListener remove(key, [remover(key, obj)]) {
         if (obj is Iterable) {
           return await Future.wait(obj.map(_removeAll));
         } else
-          return await _removeAll(obj);
+          return _removeAll(obj);
       }
     }
 
     if (e.params?.containsKey('provider') == true) {
       if (e.isBefore) {
-        e.data = await normalize(e.data);
+        e.data = normalize(e.data);
       } else if (e.isAfter) {
-        e.result = await normalize(e.result);
+        e.result = normalize(e.result);
       }
     }
   };
@@ -193,12 +193,12 @@ HookedServiceEventListener remove(key, [remover(key, obj)]) {
 ///
 /// If [provider] is `null`, then it will be disabled to all clients.
 HookedServiceEventListener disable([provider]) {
-  return (HookedServiceEvent e) async {
+  return (HookedServiceEvent e) {
     if (e.params.containsKey('provider')) {
       if (provider == null)
         throw new AngelHttpException.methodNotAllowed();
       else if (provider is Function) {
-        var r = await provider(e);
+        var r = provider(e);
         if (r != true) throw new AngelHttpException.methodNotAllowed();
       } else {
         _provide(p) => p is Providers ? p : new Providers(p.toString());
@@ -224,7 +224,7 @@ HookedServiceEventListener addCreatedAt(
     {assign(obj, now), String key, bool serialize: true}) {
   var name = key?.isNotEmpty == true ? key : 'createdAt';
 
-  return (HookedServiceEvent e) async {
+  return (HookedServiceEvent e) {
     _assign(obj, now) {
       if (assign != null)
         return assign(obj, now);
@@ -242,17 +242,17 @@ HookedServiceEventListener addCreatedAt(
     var d = new DateTime.now().toUtc();
     var now = serialize == false ? d : d.toIso8601String();
 
-    normalize(obj) async {
+    normalize(obj) {
       if (obj != null) {
         if (obj is Iterable) {
           obj.forEach(normalize);
         } else {
-          await _assign(obj, now);
+          _assign(obj, now);
         }
       }
     }
 
-    await normalize(e.isBefore ? e.data : e.result);
+    normalize(e.isBefore ? e.data : e.result);
   };
 }
 
@@ -265,7 +265,7 @@ HookedServiceEventListener addUpdatedAt(
     {assign(obj, now), String key, bool serialize: true}) {
   var name = key?.isNotEmpty == true ? key : 'updatedAt';
 
-  return (HookedServiceEvent e) async {
+  return (HookedServiceEvent e) {
     _assign(obj, now) {
       if (assign != null)
         return assign(obj, now);
@@ -283,16 +283,16 @@ HookedServiceEventListener addUpdatedAt(
     var d = new DateTime.now().toUtc();
     var now = serialize == false ? d : d.toIso8601String();
 
-    normalize(obj) async {
+    normalize(obj) {
       if (obj != null) {
         if (obj is Iterable) {
           obj.forEach(normalize);
         } else {
-          await _assign(obj, now);
+          _assign(obj, now);
         }
       }
     }
 
-    await normalize(e.isBefore ? e.data : e.result);
+    normalize(e.isBefore ? e.data : e.result);
   };
 }
diff --git a/lib/src/core/angel_base.dart b/lib/src/core/angel_base.dart
index 3bc8c7b6..bf055630 100644
--- a/lib/src/core/angel_base.dart
+++ b/lib/src/core/angel_base.dart
@@ -9,9 +9,8 @@ typedef Future<String> ViewGenerator(String path, [Map data]);
 
 /// Base class for Angel servers. Do not bother extending this.
 class AngelBase extends Routable {
-  static ViewGenerator noViewEngineConfigured = (String view,
-          [Map data]) async =>
-      "No view engine has been configured yet.";
+  static ViewGenerator noViewEngineConfigured = (String view, [Map data]) =>
+      new Future<String>.value("No view engine has been configured yet.");
 
   Container _container = new Container();
 
@@ -35,9 +34,10 @@ class AngelBase extends Routable {
   ViewGenerator viewGenerator = noViewEngineConfigured;
 
   /// Closes this instance, rendering it **COMPLETELY DEFUNCT**.
-  Future close() async {
-    await super.close();
+  Future close() {
+    super.close();
     _container = null;
     viewGenerator = noViewEngineConfigured;
+    return new Future.value();
   }
 }
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index 51580c8c..ef500a9a 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -67,7 +67,7 @@ class HookedService extends Service {
 
   /// Closes any open [StreamController]s on this instance. **Internal use only**.
   @override
-  Future close() async {
+  Future close() {
     _ctrl.forEach((c) => c.close());
     beforeIndexed._close();
     beforeRead._close();
@@ -81,7 +81,8 @@ class HookedService extends Service {
     afterModified._close();
     afterUpdated._close();
     afterRemoved._close();
-    await inner.close();
+    inner.close();
+    return new Future.value();
   }
 
   /// Adds hooks to this instance.
@@ -120,149 +121,16 @@ class HookedService extends Service {
     applyListeners(inner.remove, afterRemoved, true);
   }
 
-  /// Adds routes to this instance.
-  @override
-  void addRoutes() {
-    // Set up our routes. We still need to copy middleware from inner service
-    Map restProvider = {'provider': Providers.rest};
+  List get bootstrappers => new List.from(super.bootstrappers)
+    ..add((RequestContext req, ResponseContext res) {
+      req.serviceParams
+        ..['__requestctx'] = req
+        ..['__responsectx'] = res;
+      return true;
+    });
 
-    // Add global middleware if declared on the instance itself
-    Middleware before = getAnnotation(inner, Middleware);
-    List handlers = [
-      (RequestContext req, ResponseContext res) async {
-        req.serviceParams
-          ..['__requestctx'] = req
-          ..['__responsectx'] = res;
-        return true;
-      }
-    ];
-
-    if (before != null) handlers.addAll(before.handlers);
-
-    Middleware indexMiddleware = getAnnotation(inner.index, Middleware);
-    get('/', (req, res) async {
-      return await this.index(mergeMap([
-        {'query': req.query},
-        restProvider,
-        req.serviceParams
-      ]));
-    },
-        middleware: []
-          ..addAll(handlers)
-          ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
-
-    Middleware createMiddleware = getAnnotation(inner.create, Middleware);
-
-    post('/', (req, res) async {
-      var r = await this.create(
-          await req.lazyBody(),
-          mergeMap([
-            {'query': req.query},
-            restProvider,
-            req.serviceParams
-          ]));
-      res.statusCode = 201;
-      return r;
-    },
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (createMiddleware == null) ? [] : createMiddleware.handlers));
-
-    Middleware readMiddleware = getAnnotation(inner.read, Middleware);
-
-    get(
-        '/:id',
-        (req, res) async => await this.read(
-            toId(req.params['id']),
-            mergeMap([
-              {'query': req.query},
-              restProvider,
-              req.serviceParams
-            ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
-
-    Middleware modifyMiddleware = getAnnotation(inner.modify, Middleware);
-    patch(
-        '/:id',
-        (req, res) async => await this.modify(
-            toId(req.params['id']),
-            await req.lazyBody(),
-            mergeMap([
-              {'query': req.query},
-              restProvider,
-              req.serviceParams
-            ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (modifyMiddleware == null) ? [] : modifyMiddleware.handlers));
-
-    Middleware updateMiddleware = getAnnotation(inner.update, Middleware);
-    post(
-        '/:id',
-        (req, res) async => await this.update(
-            toId(req.params['id']),
-            await req.lazyBody(),
-            mergeMap([
-              {'query': req.query},
-              restProvider,
-              req.serviceParams
-            ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (updateMiddleware == null) ? [] : updateMiddleware.handlers));
-    put(
-        '/:id',
-        (req, res) async => await this.update(
-            toId(req.params['id']),
-            await req.lazyBody(),
-            mergeMap([
-              {'query': req.query},
-              restProvider,
-              req.serviceParams
-            ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (updateMiddleware == null) ? [] : updateMiddleware.handlers));
-
-    Middleware removeMiddleware = getAnnotation(inner.remove, Middleware);
-    delete(
-        '/',
-        (req, res) async => await this.remove(
-            null,
-            mergeMap([
-              {'query': req.query},
-              restProvider,
-              req.serviceParams
-            ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (removeMiddleware == null) ? [] : removeMiddleware.handlers));
-    delete(
-        '/:id',
-        (req, res) async => await this.remove(
-            toId(req.params['id']),
-            mergeMap([
-              {'query': req.query},
-              restProvider,
-              req.serviceParams
-            ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (removeMiddleware == null) ? [] : removeMiddleware.handlers));
-
-    // REST compliance
-    put('/', () => throw new AngelHttpException.notFound());
-    patch('/', () => throw new AngelHttpException.notFound());
-
-    addHooks();
+  void addRoutes([Service s]) {
+    super.addRoutes(s ?? inner);
   }
 
   /// Runs the [listener] before every service method specified.
@@ -388,192 +256,165 @@ class HookedService extends Service {
   }
 
   @override
-  Future index([Map _params]) async {
+  Future index([Map _params]) {
     var params = _stripReq(_params);
-    HookedServiceEvent before = await beforeIndexed._emit(
-        new HookedServiceEvent(false, _getRequest(_params),
+    return beforeIndexed
+        ._emit(new HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.indexed,
-            params: params));
-    if (before._canceled) {
-      HookedServiceEvent after = await beforeIndexed._emit(
-          new HookedServiceEvent(true, _getRequest(_params),
-              _getResponse(_params), inner, HookedServiceEvent.indexed,
-              params: params, result: before.result));
-      return after.result;
-    }
+            params: params))
+        .then((before) {
+      if (before._canceled) {
+        return beforeIndexed
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.indexed,
+                params: params, result: before.result))
+            .then((after) => after.result);
+      }
 
-    var result = await inner.index(params);
-    HookedServiceEvent after = await afterIndexed._emit(new HookedServiceEvent(
-        true,
-        _getRequest(_params),
-        _getResponse(_params),
-        inner,
-        HookedServiceEvent.indexed,
-        params: params,
-        result: result));
-    return after.result;
+      return inner.index(params).then((result) {
+        return afterIndexed
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.indexed,
+                params: params, result: result))
+            .then((after) => after.result);
+      });
+    });
   }
 
   @override
-  Future read(id, [Map _params]) async {
+  Future read(id, [Map _params]) {
     var params = _stripReq(_params);
-    HookedServiceEvent before = await beforeRead._emit(new HookedServiceEvent(
-        false,
-        _getRequest(_params),
-        _getResponse(_params),
-        inner,
-        HookedServiceEvent.indexed,
-        id: id,
-        params: params));
+    return beforeRead
+        ._emit(new HookedServiceEvent(false, _getRequest(_params),
+            _getResponse(_params), inner, HookedServiceEvent.read,
+            id: id, params: params))
+        .then((before) {
+      if (before._canceled) {
+        return beforeRead
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.read,
+                id: id, params: params, result: before.result))
+            .then((after) => after.result);
+      }
 
-    if (before._canceled) {
-      HookedServiceEvent after = await afterRead._emit(new HookedServiceEvent(
-          true,
-          _getRequest(_params),
-          _getResponse(_params),
-          inner,
-          HookedServiceEvent.read,
-          id: id,
-          params: params,
-          result: before.result));
-      return after.result;
-    }
-
-    var result = await inner.read(id, params);
-    HookedServiceEvent after = await afterRead._emit(new HookedServiceEvent(
-        true,
-        _getRequest(_params),
-        _getResponse(_params),
-        inner,
-        HookedServiceEvent.read,
-        id: id,
-        params: params,
-        result: result));
-    return after.result;
+      return inner.read(id, params).then((result) {
+        return afterRead
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.read,
+                id: id, params: params, result: result))
+            .then((after) => after.result);
+      });
+    });
   }
 
   @override
-  Future create(data, [Map _params]) async {
+  Future create(data, [Map _params]) {
     var params = _stripReq(_params);
-    HookedServiceEvent before = await beforeCreated._emit(
-        new HookedServiceEvent(false, _getRequest(_params),
+    return beforeCreated
+        ._emit(new HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.created,
-            data: data, params: params));
+            data: data, params: params))
+        .then((before) {
+      if (before._canceled) {
+        return beforeCreated
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.created,
+                data: data, params: params, result: before.result))
+            .then((after) => after.result);
+      }
 
-    if (before._canceled) {
-      HookedServiceEvent after = await afterCreated._emit(
-          new HookedServiceEvent(true, _getRequest(_params),
-              _getResponse(_params), inner, HookedServiceEvent.created,
-              data: data, params: params, result: before.result));
-      return after.result;
-    }
-
-    var result = await inner.create(data, params);
-    HookedServiceEvent after = await afterCreated._emit(new HookedServiceEvent(
-        true,
-        _getRequest(_params),
-        _getResponse(_params),
-        inner,
-        HookedServiceEvent.created,
-        data: data,
-        params: params,
-        result: result));
-    return after.result;
+      return inner.create(data, params).then((result) {
+        return afterCreated
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.created,
+                data: data, params: params, result: result))
+            .then((after) => after.result);
+      });
+    });
   }
 
   @override
-  Future modify(id, data, [Map _params]) async {
+  Future modify(id, data, [Map _params]) {
     var params = _stripReq(_params);
-    HookedServiceEvent before = await beforeModified._emit(
-        new HookedServiceEvent(false, _getRequest(_params),
+    return beforeModified
+        ._emit(new HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.modified,
-            id: id, data: data, params: params));
+            id: id, data: data, params: params))
+        .then((before) {
+      if (before._canceled) {
+        return beforeModified
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.modified,
+                id: id, data: data, params: params, result: before.result))
+            .then((after) => after.result);
+      }
 
-    if (before._canceled) {
-      HookedServiceEvent after = await afterModified._emit(
-          new HookedServiceEvent(true, _getRequest(_params),
-              _getResponse(_params), inner, HookedServiceEvent.modified,
-              id: id, data: data, params: params, result: before.result));
-      return after.result;
-    }
-
-    var result = await inner.modify(id, data, params);
-    HookedServiceEvent after = await afterModified._emit(new HookedServiceEvent(
-        true,
-        _getRequest(_params),
-        _getResponse(_params),
-        inner,
-        HookedServiceEvent.modified,
-        id: id,
-        data: data,
-        params: params,
-        result: result));
-    return after.result;
+      return inner.modify(id, data, params).then((result) {
+        return afterModified
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.created,
+                id: id, data: data, params: params, result: result))
+            .then((after) => after.result);
+      });
+    });
   }
 
   @override
-  Future update(id, data, [Map _params]) async {
+  Future update(id, data, [Map _params]) {
     var params = _stripReq(_params);
-    HookedServiceEvent before = await beforeUpdated._emit(
-        new HookedServiceEvent(false, _getRequest(_params),
+    return beforeUpdated
+        ._emit(new HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.updated,
-            id: id, data: data, params: params));
+            id: id, data: data, params: params))
+        .then((before) {
+      if (before._canceled) {
+        return beforeUpdated
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.updated,
+                id: id, data: data, params: params, result: before.result))
+            .then((after) => after.result);
+      }
 
-    if (before._canceled) {
-      HookedServiceEvent after = await afterUpdated._emit(
-          new HookedServiceEvent(true, _getRequest(_params),
-              _getResponse(_params), inner, HookedServiceEvent.updated,
-              id: id, data: data, params: params, result: before.result));
-      return after.result;
-    }
-
-    var result = await inner.update(id, data, params);
-    HookedServiceEvent after = await afterUpdated._emit(new HookedServiceEvent(
-        true,
-        _getRequest(_params),
-        _getResponse(_params),
-        inner,
-        HookedServiceEvent.updated,
-        id: id,
-        data: data,
-        params: params,
-        result: result));
-    return after.result;
+      return inner.update(id, data, params).then((result) {
+        return afterUpdated
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.updated,
+                id: id, data: data, params: params, result: result))
+            .then((after) => after.result);
+      });
+    });
   }
 
   @override
-  Future remove(id, [Map _params]) async {
+  Future remove(id, [Map _params]) {
     var params = _stripReq(_params);
-    HookedServiceEvent before = await beforeRemoved._emit(
-        new HookedServiceEvent(false, _getRequest(_params),
+    return beforeRemoved
+        ._emit(new HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.removed,
-            id: id, params: params));
+            id: id, params: params))
+        .then((before) {
+      if (before._canceled) {
+        return beforeRemoved
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.removed,
+                id: id, params: params, result: before.result))
+            .then((after) => after.result);
+      }
 
-    if (before._canceled) {
-      HookedServiceEvent after = await afterRemoved._emit(
-          new HookedServiceEvent(true, _getRequest(_params),
-              _getResponse(_params), inner, HookedServiceEvent.removed,
-              id: id, params: params, result: before.result));
-      return after.result;
-    }
-
-    var result = await inner.remove(id, params);
-    HookedServiceEvent after = await afterRemoved._emit(new HookedServiceEvent(
-        true,
-        _getRequest(_params),
-        _getResponse(_params),
-        inner,
-        HookedServiceEvent.removed,
-        id: id,
-        params: params,
-        result: result));
-    return after.result;
+      return inner.remove(id, params).then((result) {
+        return afterRemoved
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.removed,
+                id: id, params: params, result: result))
+            .then((after) => after.result);
+      });
+    });
   }
 
   /// Fires an `after` event. This will not be propagated to clients,
   /// but will be broadcasted to WebSockets, etc.
   Future<HookedServiceEvent> fire(String eventName, result,
-      [HookedServiceEventListener callback]) async {
+      [HookedServiceEventListener callback]) {
     HookedServiceEventDispatcher dispatcher;
 
     switch (eventName) {
@@ -600,15 +441,15 @@ class HookedService extends Service {
     }
 
     var ev = new HookedServiceEvent(true, null, null, this, eventName);
-    return await fireEvent(dispatcher, ev, callback);
+    return fireEvent(dispatcher, ev, callback);
   }
 
   /// Sends an arbitrary event down the hook chain.
   Future<HookedServiceEvent> fireEvent(
       HookedServiceEventDispatcher dispatcher, HookedServiceEvent event,
-      [HookedServiceEventListener callback]) async {
-    if (callback != null && event?._canceled != true) await callback(event);
-    return await dispatcher._emit(event);
+      [HookedServiceEventListener callback]) {
+    if (callback != null && event?._canceled != true) callback(event);
+    return dispatcher._emit(event);
   }
 }
 
@@ -690,16 +531,16 @@ class HookedServiceEventDispatcher {
   }
 
   /// Fires an event, and returns it once it is either canceled, or all listeners have run.
-  Future<HookedServiceEvent> _emit(HookedServiceEvent event) async {
+  Future<HookedServiceEvent> _emit(HookedServiceEvent event) {
     if (event?._canceled != true) {
       for (var listener in listeners) {
-        await listener(event);
+        listener(event);
 
-        if (event._canceled) return event;
+        if (event._canceled) return new Future.value(event);
       }
     }
 
-    return event;
+    return new Future.value(event);
   }
 
   /// Returns a [Stream] containing all events fired by this dispatcher.
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index fba314ab..b9594642 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -78,10 +78,11 @@ bool suitableForInjection(
 
 /// Handles a request with a DI-enabled handler.
 RequestHandler handleContained(handler, InjectionRequest injection) {
-  return (RequestContext req, ResponseContext res) async {
+  return (RequestContext req, ResponseContext res) {
     if (injection.parameters.isNotEmpty &&
         injection.parameters.values.any((p) => p.match != null) &&
-        !suitableForInjection(req, res, injection)) return true;
+        !suitableForInjection(req, res, injection))
+      return new Future.value(true);
 
     List args = [];
 
@@ -94,8 +95,7 @@ RequestHandler handleContained(handler, InjectionRequest injection) {
       named[name] = resolveInjection([k, v], injection, req, res, false);
     });
 
-    var result = Function.apply(handler, args, named);
-    return result is Future ? await result : result;
+    return Function.apply(handler, args, named);
   };
 }
 
@@ -181,6 +181,5 @@ InjectionRequest preInject(Function handler) {
       injection.named[name] = type;
     }
   }
-
   return injection;
 }
diff --git a/lib/src/core/map_service.dart b/lib/src/core/map_service.dart
index 9f89f0f0..3f2d9e90 100644
--- a/lib/src/core/map_service.dart
+++ b/lib/src/core/map_service.dart
@@ -45,13 +45,13 @@ class MapService extends Service {
   }
 
   @override
-  Future<List> index([Map params]) async {
+  Future<List> index([Map params]) {
     if (allowQuery == false || params == null || params['query'] is! Map)
-      return items;
+      return new Future.value(items);
     else {
       Map query = params['query'];
 
-      return items.where((item) {
+      return new Future.value(items.where((item) {
         for (var key in query.keys) {
           if (!item.containsKey(key))
             return false;
@@ -59,19 +59,19 @@ class MapService extends Service {
         }
 
         return true;
-      }).toList();
+      }).toList());
     }
   }
 
   @override
-  Future<Map> read(id, [Map params]) async {
-    return items.firstWhere(_matchesId(id),
+  Future<Map> read(id, [Map params]) {
+    return new Future.value(items.firstWhere(_matchesId(id),
         orElse: () => throw new AngelHttpException.notFound(
-            message: 'No record found for ID $id'));
+            message: 'No record found for ID $id')));
   }
 
   @override
-  Future<Map> create(data, [Map params]) async {
+  Future<Map> create(data, [Map params]) {
     if (data is! Map)
       throw new AngelHttpException.badRequest(
           message:
@@ -86,70 +86,71 @@ class MapService extends Service {
         ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] = now;
     }
     items.add(result);
-    return result;
+    return new Future.value(result);
   }
 
   @override
-  Future<Map> modify(id, data, [Map params]) async {
+  Future<Map> modify(id, data, [Map params]) {
     if (data is! Map)
       throw new AngelHttpException.badRequest(
           message:
               'MapService does not support `modify` with ${data.runtimeType}.');
-    if (!items.any(_matchesId(id))) return await create(data, params);
+    if (!items.any(_matchesId(id))) return create(data, params);
 
-    var item = await read(id);
-    var result = item..addAll(data);
+    return read(id).then((item) {
+      var result = item..addAll(data);
 
-    if (autoIdAndDateFields == true)
-      result
-        ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
-            new DateTime.now().toIso8601String();
-    return result;
+      if (autoIdAndDateFields == true)
+        result
+          ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
+              new DateTime.now().toIso8601String();
+      return new Future.value(result);
+    });
   }
 
   @override
-  Future<Map> update(id, data, [Map params]) async {
+  Future<Map> update(id, data, [Map params]) {
     if (data is! Map)
       throw new AngelHttpException.badRequest(
           message:
               'MapService does not support `update` with ${data.runtimeType}.');
-    if (!items.any(_matchesId(id))) return await create(data, params);
+    if (!items.any(_matchesId(id))) return create(data, params);
 
-    var old = await read(id);
+    return read(id).then((old) {
+      if (!items.remove(old))
+        throw new AngelHttpException.notFound(
+            message: 'No record found for ID $id');
 
-    if (!items.remove(old))
-      throw new AngelHttpException.notFound(
-          message: 'No record found for ID $id');
-
-    var result = data;
-    if (autoIdAndDateFields == true) {
-      result
-        ..['id'] = id?.toString()
-        ..[autoSnakeCaseNames == false ? 'createdAt' : 'created_at'] =
-            old[autoSnakeCaseNames == false ? 'createdAt' : 'created_at']
-        ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
-            new DateTime.now().toIso8601String();
-    }
-    items.add(result);
-    return result;
+      var result = data;
+      if (autoIdAndDateFields == true) {
+        result
+          ..['id'] = id?.toString()
+          ..[autoSnakeCaseNames == false ? 'createdAt' : 'created_at'] =
+              old[autoSnakeCaseNames == false ? 'createdAt' : 'created_at']
+          ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
+              new DateTime.now().toIso8601String();
+      }
+      items.add(result);
+      return new Future.value(result);
+    });
   }
 
   @override
-  Future<Map> remove(id, [Map params]) async {
+  Future<Map> remove(id, [Map params]) {
     if (id == null ||
         id == 'null' &&
             (allowRemoveAll == true ||
                 params?.containsKey('provider') != true)) {
       items.clear();
-      return {};
+      return new Future.value({});
     }
 
-    var result = await read(id, params);
-
-    if (items.remove(result))
-      return result;
-    else
-      throw new AngelHttpException.notFound(
-          message: 'No record found for ID $id');
+    return read(id, params).then((result) {
+      if (items.remove(result))
+        return result;
+      else
+        throw new AngelHttpException.notFound(
+            message: 'No record found for ID $id');
+    });
   }
 }
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 4cb6d625..c926c792 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -10,6 +10,7 @@ import 'metadata.dart';
 import 'response_context.dart';
 import 'routable.dart';
 import 'server.dart' show Angel;
+
 part 'injection.dart';
 
 /// A convenience wrapper around an incoming HTTP request.
@@ -167,8 +168,8 @@ abstract class RequestContext {
   void inject(type, value) {
     if (!app.isProduction && type is Type) {
       if (!reflect(value).type.isAssignableTo(reflectType(type)))
-        throw new ArgumentError(
-            'Cannot inject $value (${value.runtimeType}) as an instance of $type.');
+        throw new ArgumentError('Cannot inject $value (${value
+                .runtimeType}) as an instance of $type.');
     }
 
     _injections[type] = value;
@@ -230,12 +231,12 @@ abstract class RequestContext {
   }
 
   /// Manually parses the request body, if it has not already been parsed.
-  Future<BodyParseResult> parse() async {
+  Future<BodyParseResult> parse() {
     if (_body != null)
-      return _body;
+      return new Future.value(_body);
     else
       _provisionalQuery = null;
-    return _body = await parseOnce();
+    return parseOnce().then((body) => _body = body);
   }
 
   /// Override this method to one-time parse an incoming request.
@@ -243,7 +244,7 @@ abstract class RequestContext {
   Future<BodyParseResult> parseOnce();
 
   /// Disposes of all resources.
-  Future close() async {
+  Future close() {
     _body = null;
     _acceptsAllCache = null;
     _acceptHeaderCache = null;
@@ -252,5 +253,6 @@ abstract class RequestContext {
     _injections.clear();
     serviceParams.clear();
     params.clear();
+    return new Future.value();
   }
 }
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index cf4bddac..4851c21b 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -123,10 +123,11 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   /// If `true`, all response finalizers will be skipped.
   bool willCloseItself = false;
 
-  static StateError closed() => new StateError('Cannot modify a closed response.');
+  static StateError closed() =>
+      new StateError('Cannot modify a closed response.');
 
   /// Sends a download as a response.
-  Future download(File file, {String filename}) async {
+  void download(File file, {String filename}) {
     if (!isOpen) throw closed();
 
     headers["Content-Disposition"] =
@@ -135,9 +136,9 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
     headers['content-length'] = file.lengthSync().toString();
 
     if (streaming) {
-      await file.openRead().pipe(this);
+      file.openRead().pipe(this);
     } else {
-      buffer.add(await file.readAsBytes());
+      buffer.add(file.readAsBytesSync());
       end();
     }
   }
@@ -157,8 +158,8 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   }
 
   /// Disposes of all resources.
-  Future dispose() async {
-    await close();
+  void dispose() {
+    close();
     properties.clear();
     encoders.clear();
     _buffer.clear();
@@ -197,11 +198,12 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   }
 
   /// Renders a view to the response stream, and closes the response.
-  Future render(String view, [Map data]) async {
+  Future render(String view, [Map data]) {
     if (!isOpen) throw closed();
-    write(await app.viewGenerator(view, data));
+    write(app.viewGenerator(view, data));
     headers['content-type'] = ContentType.HTML.toString();
     end();
+    return new Future.value();
   }
 
   /// Redirects to user to the given URL.
@@ -293,11 +295,11 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   }
 
   /// Copies a file's contents into the response buffer.
-  Future sendFile(File file) async {
+  void sendFile(File file) {
     if (!isOpen) throw closed();
 
     headers['content-type'] = lookupMimeType(file.path);
-    buffer.add(await file.readAsBytes());
+    buffer.add(file.readAsBytesSync());
     end();
   }
 
@@ -309,8 +311,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
 
     var text = serializer(value);
 
-    if (text.isEmpty)
-      return;
+    if (text.isEmpty) return;
 
     if (contentType is String)
       headers['content-type'] = contentType;
@@ -337,10 +338,8 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
       (correspondingRequest.injections[Stopwatch] as Stopwatch).stop();
     }
 
-    if (correspondingRequest?.injections?.containsKey(PoolResource) ==
-        true) {
-      (correspondingRequest.injections[PoolResource] as PoolResource)
-          .release();
+    if (correspondingRequest?.injections?.containsKey(PoolResource) == true) {
+      (correspondingRequest.injections[PoolResource] as PoolResource).release();
     }
   }
 
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index 1b46fd2a..8dafb635 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -2,7 +2,6 @@ library angel_framework.http.routable;
 
 import 'dart:async';
 import 'package:angel_route/angel_route.dart';
-import 'package:meta/meta.dart';
 import '../util.dart';
 import 'angel_base.dart';
 import 'hooked_service.dart';
@@ -22,13 +21,23 @@ typedef Future RequestHandler(RequestContext req, ResponseContext res);
 /// Sequentially runs a list of [handlers] of middleware, and returns early if any does not
 /// return `true`. Works well with [Router].chain.
 RequestMiddleware waterfall(List handlers) {
-  return (RequestContext req, res) async {
+  return (req, res) {
+    Future<bool> Function() runPipeline;
+
     for (var handler in handlers) {
-      var result = await req.app.executeHandler(handler, req, res);
-      if (result != true) return result;
+      if (handler == null) break;
+
+      if (runPipeline == null)
+        runPipeline = () => req.app.executeHandler(handler, req, res);
+      else {
+        var current = runPipeline;
+        runPipeline = () => current().then((result) =>
+            !result ? result : req.app.executeHandler(handler, req, res));
+      }
     }
 
-    return true;
+    runPipeline ??= () => new Future.value(true);
+    return runPipeline();
   };
 }
 
@@ -39,7 +48,7 @@ class Routable extends Router {
 
   Routable() : super();
 
-  Future close() async {
+  void close() {
     _services.clear();
     configuration.clear();
     requestMiddleware.clear();
@@ -63,9 +72,11 @@ class Routable extends Router {
 
   /// Assigns a middleware to a name for convenience.
   @override
-  registerMiddleware(String name, @checked RequestHandler middleware) =>
-      // ignore: deprecated_member_use
-      super.registerMiddleware(name, middleware);
+  registerMiddleware(String name, middleware) {
+    assert(middleware is RequestMiddleware);
+    // ignore: deprecated_member_use
+    super.registerMiddleware(name, middleware);
+  }
 
   /// Retrieves the service assigned to the given path.
   Service service(Pattern path) =>
@@ -116,7 +127,7 @@ class Routable extends Router {
     final handlers = [];
 
     if (_router is AngelBase) {
-      handlers.add((RequestContext req, ResponseContext res) async {
+      handlers.add((RequestContext req, ResponseContext res) {
         req.app = _router;
         res.app = _router;
         return true;
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 6666a2d0..50b67c4a 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -9,7 +9,6 @@ import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
 export 'package:container/container.dart';
 import 'package:logging/logging.dart';
-import 'package:meta/meta.dart';
 import 'package:tuple/tuple.dart';
 import '../http/http.dart';
 import 'angel_base.dart';
@@ -27,7 +26,7 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 typedef Future<HttpServer> ServerGenerator(address, int port);
 
 /// A function that configures an [Angel] server in some way.
-typedef Future AngelConfigurer(Angel app);
+typedef FutureOr AngelConfigurer(Angel app);
 
 /// A powerful real-time/REST/MVC server class.
 class Angel extends AngelBase {
@@ -202,12 +201,12 @@ class Angel extends AngelBase {
   /// Shuts down the server, and closes any open [StreamController]s.
   ///
   /// The server will be **COMPLETE DEFUNCT** after this operation!
-  Future close() async {
-    await Future.forEach(services.values, (Service service) async {
-      await service.close();
+  Future close() {
+    Future.forEach(services.values, (Service service) {
+      service.close();
     });
 
-    await super.close();
+    super.close();
     _preContained.clear();
     handlerCache.clear();
     _injections.clear();
@@ -220,8 +219,8 @@ class Angel extends AngelBase {
     shutdownHooks.clear();
     responseFinalizers.clear();
     _flattened = null;
-    await _http?.close();
-    return _http?.httpServer;
+    _http?.close();
+    return new Future.value(_http?.httpServer);
   }
 
   @override
@@ -269,52 +268,50 @@ class Angel extends AngelBase {
     this.serializer = serializer;
   }
 
-  Future getHandlerResult(
-      handler, RequestContext req, ResponseContext res) async {
+  Future getHandlerResult(handler, RequestContext req, ResponseContext res) {
     if (handler is RequestHandler) {
-      var result = await handler(req, res);
-      return await getHandlerResult(result, req, res);
+      var result = handler(req, res);
+      return getHandlerResult(result, req, res);
     }
 
     if (handler is Future) {
-      var result = await handler;
-      return await getHandlerResult(result, req, res);
+      return handler.then((result) => getHandlerResult(result, req, res));
     }
 
     if (handler is Function) {
-      var result = await runContained(handler, req, res);
-      return await getHandlerResult(result, req, res);
+      var result = runContained(handler, req, res);
+      return getHandlerResult(result, req, res);
     }
 
     if (handler is Stream) {
-      return await getHandlerResult(await handler.toList(), req, res);
+      return getHandlerResult(handler.toList(), req, res);
     }
 
     var middleware = (req.app ?? this).findMiddleware(handler);
     if (middleware != null) {
-      return await getHandlerResult(middleware, req, res);
+      return getHandlerResult(middleware, req, res);
     }
 
-    return handler;
+    return new Future.value(handler);
   }
 
   /// Runs some [handler]. Returns `true` if request execution should continue.
   Future<bool> executeHandler(
-      handler, RequestContext req, ResponseContext res) async {
-    var result = await getHandlerResult(handler, req, res);
-
-    if (result == null)
-      return false;
-    else if (result is bool) {
-      return result;
-    } else if (result != null) {
-      // TODO: Make `serialize` return a bool, return this as the value.
-      // Do this wherever applicable
-      res.serialize(result,
-          contentType: res.headers['content-type'] ?? 'application/json');
-      return false;
-    } else
-      return res.isOpen;
+      handler, RequestContext req, ResponseContext res) {
+    return getHandlerResult(handler, req, res).then((result) {
+      if (result == null)
+        return false;
+      else if (result is bool) {
+        return result;
+      } else if (result != null) {
+        // TODO: Make `serialize` return a bool, return this as the value.
+        // Do this wherever applicable
+        res.serialize(result,
+            contentType: res.headers['content-type'] ?? 'application/json');
+        return false;
+      } else
+        return res.isOpen;
+    });
   }
 
   /// Use the serving methods in [AngelHttp] instead.
@@ -400,20 +397,22 @@ class Angel extends AngelBase {
   /// the execution will be faster, as the injection requirements were stored beforehand.
   Future runContained(
       Function handler, RequestContext req, ResponseContext res) {
-    if (_preContained.containsKey(handler)) {
-      return handleContained(handler, _preContained[handler])(req, res);
-    }
+    return new Future.sync(() {
+      if (_preContained.containsKey(handler)) {
+        return handleContained(handler, _preContained[handler])(req, res);
+      }
 
-    return runReflected(handler, req, res);
+      return runReflected(handler, req, res);
+    });
   }
 
   /// Runs with DI, and *always* reflects. Prefer [runContained].
   Future runReflected(
-      Function handler, RequestContext req, ResponseContext res) async {
+      Function handler, RequestContext req, ResponseContext res) {
     var h =
         handleContained(handler, _preContained[handler] = preInject(handler));
-    return await h(req, res);
-    // return await closureMirror.apply(args).reflectee;
+    return new Future.sync(() => h(req, res));
+    // return   closureMirror.apply(args).reflectee;
   }
 
   /// Use the serving methods in [AngelHttp] instead.
@@ -432,8 +431,8 @@ class Angel extends AngelBase {
   }
 
   /// Applies an [AngelConfigurer] to this instance.
-  Future configure(AngelConfigurer configurer) async {
-    await configurer(this);
+  Future configure(AngelConfigurer configurer) {
+    return new Future.sync(() => configurer(this));
   }
 
   /// Mounts the child on this router. If [routable] is `null`,
@@ -447,7 +446,7 @@ class Angel extends AngelBase {
   /// NOTE: The above will not be properly copied if [path] is
   /// a [RegExp].
   @override
-  use(path, [@checked Routable routable, String namespace = null]) {
+  use(path, [Router routable, String namespace = null]) {
     if (routable == null) return all('*', path);
 
     var head = path.toString().replaceAll(_straySlashes, '');
@@ -457,13 +456,13 @@ class Angel extends AngelBase {
       _preContained.addAll(routable._preContained);
 
       if (routable.responseFinalizers.isNotEmpty) {
-        responseFinalizers.add((req, res) async {
+        responseFinalizers.add((req, res) {
           if (req.path.replaceAll(_straySlashes, '').startsWith(head)) {
             for (var finalizer in routable.responseFinalizers)
-              await finalizer(req, res);
+              finalizer(req, res);
           }
 
-          return true;
+          return new Future.value(true);
         });
       }
 
@@ -493,15 +492,17 @@ class Angel extends AngelBase {
   }
 
   @deprecated
-  Future<ZoneSpecification> defaultZoneCreator(request, req, res) async {
-    return new ZoneSpecification(
-      print: (Zone self, ZoneDelegate parent, Zone zone, String line) {
-        if (logger != null) {
-          logger.info(line);
-        } else {
-          return parent.print(zone, line);
-        }
-      },
+  Future<ZoneSpecification> defaultZoneCreator(request, req, res) {
+    return new Future.value(
+      new ZoneSpecification(
+        print: (Zone self, ZoneDelegate parent, Zone zone, String line) {
+          if (logger != null) {
+            logger.info(line);
+          } else {
+            return parent.print(zone, line);
+          }
+        },
+      ),
     );
   }
 
@@ -518,9 +519,8 @@ class Angel extends AngelBase {
   factory Angel.fromSecurityContext(SecurityContext context) {
     var app = new Angel();
 
-    app._http =
-        new AngelHttp.custom(app, (address, int port) async {
-      return await HttpServer.bindSecure(address, port, context);
+    app._http = new AngelHttp.custom(app, (address, int port) {
+      return HttpServer.bindSecure(address, port, context);
     });
 
     return app;
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index ea6f7f2a..3cd6e6fd 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -7,6 +7,7 @@ import '../util.dart';
 import 'angel_base.dart';
 import 'hooked_service.dart' show HookedService;
 import 'metadata.dart';
+import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
 
@@ -54,11 +55,14 @@ class Service extends Routable {
     'token'
   ];
 
+  /// Handlers that must run to ensure this service's functionality.
+  List get bootstrappers => [];
+
   /// The [Angel] app powering this service.
   AngelBase app;
 
   /// Closes this service, including any database connections or stream controllers.
-  Future close() async {}
+  void close() {}
 
   /// Retrieves all resources.
   Future index([Map params]) {
@@ -99,18 +103,22 @@ class Service extends Routable {
   }
 
   /// Generates RESTful routes pointing to this class's methods.
-  void addRoutes() {
+  void addRoutes([Service service]) {
+    _addRoutesInner(service ?? this, bootstrappers);
+  }
+
+  void _addRoutesInner(Service service,
+      List handlers) {
     Map restProvider = {'provider': Providers.rest};
 
     // Add global middleware if declared on the instance itself
-    Middleware before = getAnnotation(this, Middleware);
-    final handlers = [];
+    Middleware before = getAnnotation(service, Middleware);
 
     if (before != null) handlers.addAll(before.handlers);
 
-    Middleware indexMiddleware = getAnnotation(this.index, Middleware);
-    get('/', (req, res) async {
-      return await this.index(mergeMap([
+    Middleware indexMiddleware = getAnnotation(service.index, Middleware);
+    get('/', (req, res) {
+      return this.index(mergeMap([
         {'query': req.query},
         restProvider,
         req.serviceParams
@@ -120,28 +128,33 @@ class Service extends Routable {
           ..addAll(handlers)
           ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
-    Middleware createMiddleware = getAnnotation(this.create, Middleware);
-    post('/', (req, ResponseContext res) async {
-      var r = await this.create(
-          await req.lazyBody(),
-          mergeMap([
-            {'query': req.query},
-            restProvider,
-            req.serviceParams
-          ]));
-      res.statusCode = 201;
-      return r;
+    Middleware createMiddleware = getAnnotation(service.create, Middleware);
+    post('/', (RequestContext req, ResponseContext res) {
+      return req.lazyBody().then((body) {
+        return this
+            .create(
+                body,
+                mergeMap([
+                  {'query': req.query},
+                  restProvider,
+                  req.serviceParams
+                ]))
+            .then((r) {
+          res.statusCode = 201;
+          return r;
+        });
+      });
     },
         middleware: []
           ..addAll(handlers)
           ..addAll(
               (createMiddleware == null) ? [] : createMiddleware.handlers));
 
-    Middleware readMiddleware = getAnnotation(this.read, Middleware);
+    Middleware readMiddleware = getAnnotation(service.read, Middleware);
 
     get(
         '/:id',
-        (req, res) async => await this.read(
+        (req, res) => this.read(
             toId(req.params['id']),
             mergeMap([
               {'query': req.query},
@@ -152,56 +165,56 @@ class Service extends Routable {
           ..addAll(handlers)
           ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
 
-    Middleware modifyMiddleware = getAnnotation(this.modify, Middleware);
+    Middleware modifyMiddleware = getAnnotation(service.modify, Middleware);
     patch(
         '/:id',
-        (req, res) async => await this.modify(
+        (RequestContext req, res) => req.lazyBody().then((body) => this.modify(
             toId(req.params['id']),
-            await req.lazyBody(),
+            body,
             mergeMap([
               {'query': req.query},
               restProvider,
               req.serviceParams
-            ])),
+            ]))),
         middleware: []
           ..addAll(handlers)
           ..addAll(
               (modifyMiddleware == null) ? [] : modifyMiddleware.handlers));
 
-    Middleware updateMiddleware = getAnnotation(this.update, Middleware);
+    Middleware updateMiddleware = getAnnotation(service.update, Middleware);
     post(
         '/:id',
-        (req, res) async => await this.update(
+        (RequestContext req, res) => req.lazyBody().then((body) => this.update(
             toId(req.params['id']),
-            await req.lazyBody(),
+            body,
             mergeMap([
               {'query': req.query},
               restProvider,
               req.serviceParams
-            ])),
+            ]))),
         middleware: []
           ..addAll(handlers)
           ..addAll(
               (updateMiddleware == null) ? [] : updateMiddleware.handlers));
     put(
         '/:id',
-        (req, res) async => await this.update(
+        (RequestContext req, res) => req.lazyBody().then((body) => this.update(
             toId(req.params['id']),
-            await req.lazyBody(),
+            body,
             mergeMap([
               {'query': req.query},
               restProvider,
               req.serviceParams
-            ])),
+            ]))),
         middleware: []
           ..addAll(handlers)
           ..addAll(
               (updateMiddleware == null) ? [] : updateMiddleware.handlers));
 
-    Middleware removeMiddleware = getAnnotation(this.remove, Middleware);
+    Middleware removeMiddleware = getAnnotation(service.remove, Middleware);
     delete(
         '/',
-        (req, res) async => await this.remove(
+        (req, res) => this.remove(
             null,
             mergeMap([
               {'query': req.query},
@@ -214,7 +227,7 @@ class Service extends Routable {
               (removeMiddleware == null) ? [] : removeMiddleware.handlers));
     delete(
         '/:id',
-        (req, res) async => await this.remove(
+        (req, res) => this.remove(
             toId(req.params['id']),
             mergeMap([
               {'query': req.query},
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 3682d17d..72c83eb0 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -1,9 +1,17 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io';
+import 'dart:io'
+    show
+        stderr,
+        HttpRequest,
+        HttpResponse,
+        HttpServer,
+        Platform,
+        SecurityContext;
 import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
+import 'package:dart2_constant/io.dart';
 import 'package:json_god/json_god.dart' as god;
 import 'package:pool/pool.dart';
 import 'package:stack_trace/stack_trace.dart';
@@ -17,6 +25,7 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 /// Adapts `dart:io`'s [HttpServer] to serve Angel.
 class AngelHttp {
   final Angel app;
+  final bool useZone;
   bool _closed = false;
   HttpServer _server;
   Future<HttpServer> Function(dynamic, int) _serverGenerator = HttpServer.bind;
@@ -24,7 +33,7 @@ class AngelHttp {
 
   Pool _pool;
 
-  AngelHttp(this.app);
+  AngelHttp(this.app, {this.useZone: true});
 
   /// The function used to bind this instance to an HTTP server.
   Future<HttpServer> Function(dynamic, int) get serverGenerator =>
@@ -32,15 +41,18 @@ class AngelHttp {
 
   /// An instance mounted on a server started by the [serverGenerator].
   factory AngelHttp.custom(
-      Angel app, Future<HttpServer> Function(dynamic, int) serverGenerator) {
-    return new AngelHttp(app).._serverGenerator = serverGenerator;
+      Angel app, Future<HttpServer> Function(dynamic, int) serverGenerator,
+      {bool useZone: true}) {
+    return new AngelHttp(app, useZone: useZone)
+      .._serverGenerator = serverGenerator;
   }
 
-  factory AngelHttp.fromSecurityContext(Angel app, SecurityContext context) {
-    var http = new AngelHttp(app);
+  factory AngelHttp.fromSecurityContext(Angel app, SecurityContext context,
+      {bool useZone: true}) {
+    var http = new AngelHttp(app, useZone: useZone);
 
-    http._serverGenerator = (address, int port) async {
-      return await HttpServer.bindSecure(address, port, context);
+    http._serverGenerator = (address, int port) {
+      return HttpServer.bindSecure(address, port, context);
     };
 
     return http;
@@ -53,7 +65,7 @@ class AngelHttp {
   /// the server.
   factory AngelHttp.secure(
       Angel app, String certificateChainPath, String serverKeyPath,
-      {bool debug: false, String password}) {
+      {bool debug: false, String password, bool useZone: true}) {
     var certificateChain =
         Platform.script.resolve(certificateChainPath).toFilePath();
     var serverKey = Platform.script.resolve(serverKeyPath).toFilePath();
@@ -61,7 +73,8 @@ class AngelHttp {
     serverContext.useCertificateChain(certificateChain, password: password);
     serverContext.usePrivateKey(serverKey, password: password);
 
-    return new AngelHttp.fromSecurityContext(app, serverContext);
+    return new AngelHttp.fromSecurityContext(app, serverContext,
+        useZone: useZone);
   }
 
   /// The native HttpServer running this instance.
@@ -70,139 +83,153 @@ class AngelHttp {
   /// Starts the server.
   ///
   /// Returns false on failure; otherwise, returns the HttpServer.
-  Future<HttpServer> startServer([address, int port]) async {
-    var host = address ?? InternetAddress.LOOPBACK_IP_V4;
-    _server = await _serverGenerator(host, port ?? 0);
-
-    for (var configurer in app.startupHooks) {
-      await app.configure(configurer);
-    }
-
-    app.optimizeForProduction();
-    _sub = _server.listen(handleRequest);
-    return _server;
+  Future<HttpServer> startServer([address, int port]) {
+    var host = address ?? '127.0.0.1';
+    return _serverGenerator(host, port ?? 0).then((server) {
+      _server = server;
+      return Future.wait(app.startupHooks.map(app.configure)).then((_) {
+        app.optimizeForProduction();
+        _sub = _server.listen(handleRequest);
+        return _server;
+      });
+    });
   }
 
   /// Shuts down the underlying server.
-  Future<HttpServer> close() async {
-    if (_closed) return _server;
+  Future<HttpServer> close() {
+    if (_closed) return new Future.value(_server);
     _closed = true;
     _sub?.cancel();
 
     // TODO: Remove this try/catch in 1.2.0
-    try {
-      await app.close();
-    } catch (_) {}
-
-    for (var configurer in app.shutdownHooks) await app.configure(configurer);
-    return _server;
+    var close = app.close().catchError((_) => null);
+    return close.then((_) =>
+        Future.wait(app.shutdownHooks.map(app.configure)).then((_) => _server));
   }
 
   /// Handles a single request.
-  Future handleRequest(HttpRequest request) async {
-    var req = await createRequestContext(request);
-    var res = await createResponseContext(request.response, req);
+  Future handleRequest(HttpRequest request) {
+    return createRequestContext(request).then((req) {
+      return createResponseContext(request.response, req).then((res) {
+        handle() {
+          var path = req.path;
+          if (path == '/') path = '';
 
-    var zoneSpec = new ZoneSpecification(
-      print: (self, parent, zone, line) {
-        if (app.logger != null)
-          app.logger.info(line);
-        else
-          parent.print(zone, line);
-      },
-      handleUncaughtError: (self, parent, zone, error, stackTrace) async {
-        var trace = new Trace.from(stackTrace).terse;
+          Tuple3<List, Map, ParseResult<Map<String, String>>> resolveTuple() {
+            Router r = app.optimizedRouter;
+            var resolved =
+                r.resolveAbsolute(path, method: req.method, strip: false);
 
-        try {
-          AngelHttpException e;
-
-          if (error is FormatException) {
-            e = new AngelHttpException.badRequest(message: error.message);
-          } else if (error is AngelHttpException) {
-            e = error;
-          } else {
-            e = new AngelHttpException(error,
-                stackTrace: stackTrace, message: error?.toString());
+            return new Tuple3(
+              new MiddlewarePipeline(resolved).handlers,
+              resolved.fold<Map>({}, (out, r) => out..addAll(r.allParams)),
+              resolved.isEmpty ? null : resolved.first.parseResult,
+            );
           }
 
-          if (app.logger != null) {
-            app.logger.severe(e.message ?? e.toString(), error, trace);
+          var cacheKey = req.method + path;
+          var tuple = app.isProduction
+              ? app.handlerCache.putIfAbsent(cacheKey, resolveTuple)
+              : resolveTuple();
+
+          req.params.addAll(tuple.item2);
+          req.inject(ParseResult, tuple.item3);
+
+          if (app.logger != null)
+            req.inject(Stopwatch, new Stopwatch()..start());
+
+          var pipeline = tuple.item1;
+
+          Future<bool> Function() runPipeline;
+
+          for (var handler in pipeline) {
+            if (handler == null) break;
+
+            if (runPipeline == null)
+              runPipeline = () => app.executeHandler(handler, req, res);
+            else {
+              var current = runPipeline;
+              runPipeline = () => current().then((result) =>
+                  !result ? result : app.executeHandler(handler, req, res));
+            }
           }
 
-          await handleAngelHttpException(e, trace, req, res, request);
-        } catch (e, st) {
-          var trace = new Trace.from(st).terse;
-          request.response.close();
-          // Ideally, we won't be in a position where an absolutely fatal error occurs,
-          // but if so, we'll need to log it.
-          if (app.logger != null) {
-            app.logger.severe(
-                'Fatal error occurred when processing ${request.uri}.',
-                e,
-                trace);
-          } else {
-            stderr
-              ..writeln('Fatal error occurred when processing '
-                  '${request.uri}:')
-              ..writeln(e)
-              ..writeln(trace);
-          }
+          return runPipeline == null
+              ? sendResponse(request, req, res)
+              : runPipeline().then((_) => sendResponse(request, req, res));
         }
-      },
-    );
 
-    var zone = Zone.current.fork(specification: zoneSpec);
+        if (useZone == false) {
+          return handle().whenComplete(() => res.dispose());
+        } else {
+          var zoneSpec = new ZoneSpecification(
+            print: (self, parent, zone, line) {
+              if (app.logger != null)
+                app.logger.info(line);
+              else
+                parent.print(zone, line);
+            },
+            handleUncaughtError: (self, parent, zone, error, stackTrace) {
+              var trace = new Trace.from(stackTrace).terse;
 
-    return await zone.run(() async {
-      var path = req.path;
-      if (path == '/') path = '';
+              return new Future(() {
+                AngelHttpException e;
 
-      Tuple3<List, Map, ParseResult<Map<String, String>>> resolveTuple() {
-        Router r = app.optimizedRouter;
-        var resolved =
-            r.resolveAbsolute(path, method: req.method, strip: false);
+                if (error is FormatException) {
+                  e = new AngelHttpException.badRequest(message: error.message);
+                } else if (error is AngelHttpException) {
+                  e = error;
+                } else {
+                  e = new AngelHttpException(error,
+                      stackTrace: stackTrace, message: error?.toString());
+                }
 
-        return new Tuple3(
-          new MiddlewarePipeline(resolved).handlers,
-          resolved.fold<Map>({}, (out, r) => out..addAll(r.allParams)),
-          resolved.isEmpty ? null : resolved.first.parseResult,
-        );
-      }
+                if (app.logger != null) {
+                  app.logger.severe(e.message ?? e.toString(), error, trace);
+                }
 
-      var cacheKey = req.method + path;
-      var tuple = app.isProduction
-          ? app.handlerCache.putIfAbsent(cacheKey, resolveTuple)
-          : resolveTuple();
+                return handleAngelHttpException(e, trace, req, res, request);
+              }).catchError((e, st) {
+                var trace = new Trace.from(st).terse;
+                request.response.close();
+                // Ideally, we won't be in a position where an absolutely fatal error occurs,
+                // but if so, we'll need to log it.
+                if (app.logger != null) {
+                  app.logger.severe(
+                      'Fatal error occurred when processing ${request.uri}.',
+                      e,
+                      trace);
+                } else {
+                  stderr
+                    ..writeln('Fatal error occurred when processing '
+                        '${request.uri}:')
+                    ..writeln(e)
+                    ..writeln(trace);
+                }
+              });
+            },
+          );
 
-      req.inject(Zone, zone);
-      req.inject(ZoneSpecification, zoneSpec);
-      req.params.addAll(tuple.item2);
-      req.inject(ParseResult, tuple.item3);
-
-      if (app.logger != null) req.inject(Stopwatch, new Stopwatch()..start());
-
-      var pipeline = tuple.item1;
-
-      for (var handler in pipeline) {
-        if (handler == null || !await app.executeHandler(handler, req, res))
-          break;
-      }
-
-      await sendResponse(request, req, res);
-    }).whenComplete(() {
-      res.dispose();
+          var zone = Zone.current.fork(specification: zoneSpec);
+          req.inject(Zone, zone);
+          req.inject(ZoneSpecification, zoneSpec);
+          return zone.run(handle).whenComplete(() {
+            res.dispose();
+          });
+        }
+      });
     });
   }
 
   /// Handles an [AngelHttpException].
   Future handleAngelHttpException(AngelHttpException e, StackTrace st,
       RequestContext req, ResponseContext res, HttpRequest request,
-      {bool ignoreFinalizers: false}) async {
+      {bool ignoreFinalizers: false}) {
     if (req == null || res == null) {
       try {
         app.logger?.severe(e, st);
         request.response
-          ..statusCode = HttpStatus.INTERNAL_SERVER_ERROR
+          ..statusCode = HttpStatus.internalServerError
           ..write('500 Internal Server Error')
           ..close();
       } finally {
@@ -212,12 +239,12 @@ class AngelHttp {
 
     if (res.isOpen) {
       res.statusCode = e.statusCode;
-      var result = await app.errorHandler(e, req, res);
-      await app.executeHandler(result, req, res);
+      var result = app.errorHandler(e, req, res);
+      app.executeHandler(result, req, res);
       res.end();
     }
 
-    return await sendResponse(request, req, res,
+    return sendResponse(request, req, res,
         ignoreFinalizers: ignoreFinalizers == true);
   }
 
@@ -244,8 +271,12 @@ class AngelHttp {
     List<int> outputBuffer = res.buffer.toBytes();
 
     if (res.encoders.isNotEmpty) {
-      var allowedEncodings =
-          req.headers[HttpHeaders.ACCEPT_ENCODING]?.map((str) {
+      var allowedEncodings = req.headers
+          .value('accept-encoding')
+          ?.split(',')
+          ?.map((s) => s.trim())
+          ?.where((s) => s.isNotEmpty)
+          ?.map((str) {
         // Ignore quality specifications in accept-encoding
         // ex. gzip;q=0.8
         if (!str.contains(';')) return str;
@@ -264,7 +295,7 @@ class AngelHttp {
           }
 
           if (encoder != null) {
-            request.response.headers.set(HttpHeaders.CONTENT_ENCODING, key);
+            request.response.headers.set('content-encoding', key);
             outputBuffer = res.encoders[key].convert(outputBuffer);
             request.response.contentLength = outputBuffer.length;
             break;
@@ -278,31 +309,30 @@ class AngelHttp {
       ..cookies.addAll(res.cookies)
       ..add(outputBuffer);
 
-    return finalizers.then((_) async {
-      await request.response.flush();
-      await request.response.close();
-
-      if (req.injections.containsKey(PoolResource)) {
-        req.injections[PoolResource].release();
-      }
-
-      if (app.logger != null) {
-        var sw = req.grab<Stopwatch>(Stopwatch);
-
-        if (sw.isRunning) {
-          sw?.stop();
-          app.logger.info("${res.statusCode} ${req.method} ${req.uri} (${sw
-              ?.elapsedMilliseconds ?? 'unknown'} ms)");
+    return finalizers.then((_) {
+      return request.response.close().then((_) {
+        if (req.injections.containsKey(PoolResource)) {
+          req.injections[PoolResource].release();
         }
-      }
+
+        if (app.logger != null) {
+          var sw = req.grab<Stopwatch>(Stopwatch);
+
+          if (sw.isRunning) {
+            sw?.stop();
+            app.logger.info("${res.statusCode} ${req.method} ${req.uri} (${sw
+                ?.elapsedMilliseconds ?? 'unknown'} ms)");
+          }
+        }
+      });
     });
   }
 
   Future<HttpRequestContextImpl> createRequestContext(HttpRequest request) {
     var path = request.uri.path.replaceAll(_straySlashes, '');
     if (path.length == 0) path = '/';
-    return HttpRequestContextImpl.from(request, app, path).then((req) async {
-      if (_pool != null) req.inject(PoolResource, await _pool.request());
+    return HttpRequestContextImpl.from(request, app, path).then((req) {
+      if (_pool != null) req.inject(PoolResource, _pool.request());
       if (app.injections.isNotEmpty) app.injections.forEach(req.inject);
       return req;
     });
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 3b4f7f33..40493bb2 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -27,7 +27,7 @@ class Controller {
   Controller({this.debug: false, this.injectSingleton: true});
 
   @mustCallSuper
-  Future configureServer(Angel app) async {
+  Future configureServer(Angel app)  {
     _app = app;
 
     if (injectSingleton != false) _app.container.singleton(this);
@@ -56,6 +56,7 @@ class Controller {
     final routeBuilder = _routeBuilder(instanceMirror, routable, handlers);
     classMirror.instanceMembers.forEach(routeBuilder);
     configureRoutes(routable);
+    return new Future.value();
   }
 
   Function _routeBuilder(
@@ -85,9 +86,9 @@ class Controller {
             method.parameters[1].type.reflectedType == ResponseContext) {
           // Create a regular route
           routeMappings[name] = routable
-              .addRoute(exposeDecl.method, exposeDecl.path, (req, res) async {
-            var result = await reflectedMethod(req, res);
-            return result is RequestHandler ? await result(req, res) : result;
+              .addRoute(exposeDecl.method, exposeDecl.path, (req, res)  {
+            var result =   reflectedMethod(req, res);
+            return result is RequestHandler ?   result(req, res) : result;
           }, middleware: middleware);
           return;
         }
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 00c08977..71ec5e6a 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -14,10 +14,10 @@ export 'http_response_context.dart';
 
 /// Boots a shared server instance. Use this if launching multiple isolates
 Future<HttpServer> startShared(address, int port) => HttpServer
-    .bind(address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0, shared: true);
+    .bind(address ?? '127.0.0.1', port ?? 0, shared: true);
 
 Future<HttpServer> Function(dynamic, int) startSharedSecure(SecurityContext securityContext) {
   return (address, int port) => HttpServer.bindSecure(
-      address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0, securityContext,
+      address ?? '127.0.0.1', port ?? 0, securityContext,
       shared: true);
 }
diff --git a/lib/src/http/http_request_context.dart b/lib/src/http/http_request_context.dart
index e75e2405..c483de8a 100644
--- a/lib/src/http/http_request_context.dart
+++ b/lib/src/http/http_request_context.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 import 'package:body_parser/body_parser.dart';
+import 'package:http_parser/http_parser.dart';
 import '../core/core.dart';
 
 /// An implementation of [RequestContext] that wraps a [HttpRequest].
@@ -34,7 +35,7 @@ class HttpRequestContextImpl extends RequestContext {
 
   @override
   String get method {
-    return  _override ?? originalMethod;
+    return _override ?? originalMethod;
   }
 
   @override
@@ -70,7 +71,7 @@ class HttpRequestContextImpl extends RequestContext {
 
   /// Magically transforms an [HttpRequest] into a [RequestContext].
   static Future<HttpRequestContextImpl> from(
-      HttpRequest request, Angel app, String path) async {
+      HttpRequest request, Angel app, String path) {
     HttpRequestContextImpl ctx = new HttpRequestContextImpl();
 
     String override = request.method;
@@ -116,10 +117,10 @@ class HttpRequestContextImpl extends RequestContext {
     ctx._io = request;
 
     if (app.lazyParseBodies != true) {
-      await ctx.parse();
+      return ctx.parse().then((_) => ctx);
     }
 
-    return ctx;
+    return new Future.value(ctx);
   }
 
   @override
@@ -131,8 +132,13 @@ class HttpRequestContextImpl extends RequestContext {
   }
 
   @override
-  Future<BodyParseResult> parseOnce() async {
-    return await parseBody(io,
+  Future<BodyParseResult> parseOnce() {
+    return parseBodyFromStream(
+        io,
+        io.headers.contentType != null
+            ? new MediaType.parse(io.headers.contentType.toString())
+            : null,
+        io.uri,
         storeOriginalBuffer: app.storeOriginalBuffer == true);
   }
 }
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index 01f950ce..743fa4fd 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -111,10 +111,10 @@ class HttpResponseContextImpl extends ResponseContext {
   }
 
   @override
-  Future close() async {
+  Future close()  {
     if (_useStream) {
       try {
-        await io.close();
+          io.close();
       } catch(_) {
         // This only seems to occur on `MockHttpRequest`, but
         // this try/catch prevents a crash.
@@ -122,7 +122,8 @@ class HttpResponseContextImpl extends ResponseContext {
     }
 
     _isClosed = true;
-    await super.close();
+      super.close();
     _useStream = false;
+    return new Future.value();
   }
 }
\ No newline at end of file
diff --git a/lib/src/stats/metric_server.dart b/lib/src/stats/metric_server.dart
index 06cbe0a3..5aa7463a 100644
--- a/lib/src/stats/metric_server.dart
+++ b/lib/src/stats/metric_server.dart
@@ -58,10 +58,10 @@ class AngelMetrics extends Angel {
   final AngelMetricsStats stats = new AngelMetricsStats._();
 
   @override
-  Future<HttpServer> close() async {
+  Future<HttpServer> close()  {
     _sub?.cancel();
-    await _inner.close();
-    return await super.close();
+      _inner.close();
+    return   super.close();
   }
 
   @override
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index 6322b678..ea5eaaf1 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -23,13 +23,14 @@ main() async {
 
 void start(int id) {
   var app = new Angel()..lazyParseBodies = true;
-  var http = new AngelHttp.custom(app, startShared);
+  var http = new AngelHttp.custom(app, startShared, useZone: false);
 
     app.get('/', (req, ResponseContext res) {
-      res.willCloseItself = true;
-      res.io
-        ..write('Hello, world!')
-        ..close();
+      res.write('Hello, world!');
+      //res.willCloseItself = true;
+      //res.io
+      //  ..write('Hello, world!')
+      //  ..close();
       return false;
     });
 
@@ -41,7 +42,7 @@ void start(int id) {
     return oldHandler(e, req, res);
   };
 
-  http.startServer(InternetAddress.LOOPBACK_IP_V4, 3000).then((server) {
+  http.startServer('127.0.0.1', 3000).then((server) {
     print(
         'Instance #$id listening at http://${server.address.address}:${server.port}');
   });
diff --git a/performance/hello/raw.dart b/performance/hello/raw.dart
index 6fb20f5d..72d96ef3 100644
--- a/performance/hello/raw.dart
+++ b/performance/hello/raw.dart
@@ -12,7 +12,7 @@ main() {
 
 void start(int id) {
   HttpServer
-      .bind(InternetAddress.LOOPBACK_IP_V4, 3000, shared: true)
+      .bind('127.0.0.1', 3000, shared: true)
       .then((server) {
     print(
         'Instance #$id listening at http://${server.address.address}:${server.port}');
diff --git a/pubspec.yaml b/pubspec.yaml
index e9f209bb..4bbfed57 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.3
+version: 1.1.4
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
@@ -14,6 +14,7 @@ dependencies:
   combinator: ">=1.0.0-beta <2.0.0"
   container: ^0.1.2
   dart2_constant: ^1.0.0
+  http_parser: ^3.0.0
   json_god: ^2.0.0-beta
   logging: ">=0.11.3 <1.0.0"
   matcher: ^0.12.0
@@ -23,6 +24,7 @@ dependencies:
   path: ">=1.0.0 <2.0.0"
   pool: ^1.0.0
   random_string: ^0.0.1
+  stack_trace: ^1.0.0
   tuple: ^1.0.0
 dev_dependencies:
   mock_request: ^1.0.0
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index 720cc2e4..d8193967 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -1,7 +1,8 @@
 import 'dart:async';
-import 'dart:io';
+import 'dart:io' show BytesBuilder;
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
+import 'package:dart2_constant/io.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
@@ -19,8 +20,8 @@ main() {
     app = new Angel();
     app.injectEncoders(
       {
-        'deflate': ZLIB.encoder,
-        'gzip': GZIP.encoder,
+        'deflate': zlib.encoder,
+        'gzip': gzip.encoder,
       },
     );
 
@@ -55,50 +56,50 @@ void encodingTests(Angel getApp()) {
 
     test('encodes if wildcard', () async {
       var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
-        ..headers.set(HttpHeaders.ACCEPT_ENCODING, '*')
+        ..headers.set('accept-encoding', '*')
         ..close();
       var rs = rq.response;
       await http.handleRequest(rq);
 
       var body = await getBody(rs);
-      expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'deflate');
-      expect(body, ZLIB.encode(utf8.encode('Hello, world!')));
+      expect(rs.headers.value('content-encoding'), 'deflate');
+      expect(body, zlib.encode(utf8.encode('Hello, world!')));
     });
 
     test('encodes if wildcard + multiple', () async {
       var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
-        ..headers.set(HttpHeaders.ACCEPT_ENCODING, ['foo', 'bar', '*'])
+        ..headers.set('accept-encoding', ['foo', 'bar', '*'])
         ..close();
       var rs = rq.response;
       await http.handleRequest(rq);
 
       var body = await getBody(rs);
-      expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'deflate');
-      expect(body, ZLIB.encode(utf8.encode('Hello, world!')));
+      expect(rs.headers.value('content-encoding'), 'deflate');
+      expect(body, zlib.encode(utf8.encode('Hello, world!')));
     });
 
     test('encodes if explicit', () async {
       var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
-        ..headers.set(HttpHeaders.ACCEPT_ENCODING, 'gzip');
+        ..headers.set('accept-encoding', 'gzip');
       await rq.close();
       var rs = rq.response;
       await http.handleRequest(rq);
 
       var body = await getBody(rs);
-      expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'gzip');
-      expect(body, GZIP.encode(utf8.encode('Hello, world!')));
+      expect(rs.headers.value('content-encoding'), 'gzip');
+      expect(body, gzip.encode(utf8.encode('Hello, world!')));
     });
 
     test('only uses one encoder', () async {
       var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
-        ..headers.set(HttpHeaders.ACCEPT_ENCODING, ['gzip', 'deflate']);
+        ..headers.set('accept-encoding', ['gzip', 'deflate']);
       await rq.close();
       var rs = rq.response;
       await http.handleRequest(rq);
       
       var body = await getBody(rs);
-      expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'gzip');
-      expect(body, GZIP.encode(utf8.encode('Hello, world!')));
+      expect(rs.headers.value('content-encoding'), 'gzip');
+      expect(body, gzip.encode(utf8.encode('Hello, world!')));
     });
   });
 }
diff --git a/test/exception_test.dart b/test/exception_test.dart
index ae00dc5d..0a852a9a 100644
--- a/test/exception_test.dart
+++ b/test/exception_test.dart
@@ -1,8 +1,7 @@
-import 'dart:convert';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:matcher/matcher.dart';
-import 'package:meta/meta.dart';
 import 'package:test/test.dart';
 
 main() {
@@ -41,8 +40,8 @@ main() {
   test('toMap = toJson', () {
     var exc = new AngelHttpException.badRequest();
     expect(exc.toMap(), exc.toJson());
-    var json = JSON.encode(exc.toJson());
-    var exc2 = new AngelHttpException.fromJson(json);
+    var json_ = json.encode(exc.toJson());
+    var exc2 = new AngelHttpException.fromJson(json_);
     expect(exc2.toJson(), exc.toJson());
   });
 
@@ -68,7 +67,9 @@ class _IsException extends Matcher {
       description.add('has status code $statusCode and message "$message"');
 
   @override
-  bool matches(@checked AngelHttpException item, Map matchState) {
-    return item.statusCode == statusCode && item.message == message;
+  bool matches(item, Map matchState) {
+    return item is AngelHttpException &&
+        item.statusCode == statusCode &&
+        item.message == message;
   }
 }
diff --git a/test/general_test.dart b/test/general_test.dart
index d08b6876..36550b70 100644
--- a/test/general_test.dart
+++ b/test/general_test.dart
@@ -1,6 +1,6 @@
-import 'dart:convert';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
 
@@ -32,6 +32,6 @@ main() {
     var response = await client
         .get('$url/foo', headers: {'X-HTTP-Method-Override': 'POST'});
     print('Response: ${response.body}');
-    expect(JSON.decode(response.body), equals({'hello': 'world'}));
+    expect(json.decode(response.body), equals({'hello': 'world'}));
   });
 }
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index ba55578c..20af59cb 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -51,12 +51,13 @@ main() {
       return 'DEFAULT $mode';
     });
 
-    app.logger = new Logger('parameter_meta_test')
+    /*app.logger = new Logger('parameter_meta_test')
       ..onRecord.listen((rec) {
         print(rec);
         if (rec.error != null) print(rec.error);
         if (rec.stackTrace != null) print(rec.stackTrace);
       });
+    */
   });
 
   test('injects header or throws', () async {
diff --git a/test/precontained_test.dart b/test/precontained_test.dart
index 5c9fb0c6..64a67096 100644
--- a/test/precontained_test.dart
+++ b/test/precontained_test.dart
@@ -1,5 +1,5 @@
-import 'dart:convert';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
@@ -16,8 +16,8 @@ main() {
     rq.close();
     await new AngelHttp(app).handleRequest(rq);
     var rs = rq.response;
-    var body = await rs.transform(UTF8.decoder).join();
-    expect(body, JSON.encode('bar'));
+    var body = await rs.transform(utf8.decoder).join();
+    expect(body, json.encode('bar'));
   });
 }
 
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
index b53d04ef..ec0fada9 100644
--- a/test/primitives_test.dart
+++ b/test/primitives_test.dart
@@ -1,6 +1,6 @@
-import 'dart:convert';
-import 'dart:io';
+import 'dart:io' show stderr;
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
@@ -36,22 +36,22 @@ main() {
   test('String type annotation', () async {
     var rq = new MockHttpRequest('GET', Uri.parse('/string/hello'))..close();
     await http.handleRequest(rq);
-    var rs = await rq.response.transform(UTF8.decoder).join();
-    expect(rs, JSON.encode('hello'));
+    var rs = await rq.response.transform(utf8.decoder).join();
+    expect(rs, json.encode('hello'));
   });
 
   test('Primitive after parsed param injection', () async {
     var rq = new MockHttpRequest('GET', Uri.parse('/num/parsed/24'))..close();
     await http.handleRequest(rq);
-    var rs = await rq.response.transform(UTF8.decoder).join();
-    expect(rs, JSON.encode(24));
+    var rs = await rq.response.transform(utf8.decoder).join();
+    expect(rs, json.encode(24));
   });
 
   test('globally-injected primitive', () async {
     var rq = new MockHttpRequest('GET', Uri.parse('/num/global'))..close();
     await http.handleRequest(rq);
-    var rs = await rq.response.transform(UTF8.decoder).join();
-    expect(rs, JSON.encode(305));
+    var rs = await rq.response.transform(utf8.decoder).join();
+    expect(rs, json.encode(305));
   });
 
   test('unparsed primitive throws error', () async {
diff --git a/test/repeat_request_test.dart b/test/repeat_request_test.dart
index f4fb9edf..294066b4 100644
--- a/test/repeat_request_test.dart
+++ b/test/repeat_request_test.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
-import 'dart:convert';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
@@ -13,9 +13,9 @@ main() {
     var app = new Angel()..get('/test/:id', (id) => 'Hello $id');
     var rq1 = mk(1), rq2 = mk(2), rq3 = mk(1);
     await Future.wait([rq1, rq2, rq3].map(new AngelHttp(app).handleRequest));
-    var body1 = await rq1.response.transform(UTF8.decoder).join(),
-        body2 = await rq2.response.transform(UTF8.decoder).join(),
-        body3 = await rq3.response.transform(UTF8.decoder).join();
+    var body1 = await rq1.response.transform(utf8.decoder).join(),
+        body2 = await rq2.response.transform(utf8.decoder).join(),
+        body3 = await rq3.response.transform(utf8.decoder).join();
     print('Response #1: $body1');
     print('Response #2: $body2');
     print('Response #3: $body3');
diff --git a/test/routing_test.dart b/test/routing_test.dart
index d8eb93cd..4e95e7d0 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -1,6 +1,5 @@
-import 'dart:convert';
-import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
 
@@ -96,7 +95,7 @@ main() {
 
     client = new http.Client();
     var server =
-        await new AngelHttp(app).startServer(InternetAddress.LOOPBACK_IP_V4, 0);
+        await new AngelHttp(app).startServer('127.0.0.1', 0);
     url = "http://${server.address.host}:${server.port}";
   });
 
@@ -118,10 +117,10 @@ main() {
   test('Can match url with multiple parameters', () async {
     var response = await client.get('$url/name/HELLO/last/WORLD');
     print('Response: ${response.body}');
-    var json = JSON.decode(response.body);
-    expect(json, new isInstanceOf<Map<String, String>>());
-    expect(json['first'], equals('HELLO'));
-    expect(json['last'], equals('WORLD'));
+    var json_ = json.decode(response.body);
+    expect(json_, new isInstanceOf<Map<String, String>>());
+    expect(json_['first'], equals('HELLO'));
+    expect(json_['last'], equals('WORLD'));
   });
 
   test('Chained routes', () async {
@@ -131,16 +130,16 @@ main() {
 
   test('Can nest another Angel instance', () async {
     var response = await client.post('$url/nes/ted/foo');
-    var json = JSON.decode(response.body);
-    expect(json['route'], equals('foo'));
+    var json_ = json.decode(response.body);
+    expect(json_['route'], equals('foo'));
   });
 
   test('Can parse parameters from a nested Angel instance', () async {
     var response = await client.get('$url/todos/1337/action/test');
-    var json = JSON.decode(response.body);
-    print('JSON: $json');
-    expect(json['id'], equals('1337'));
-    expect(json['action'], equals('test'));
+    var json_ = json.decode(response.body);
+    print('JSON: $json_');
+    expect(json_['id'], equals('1337'));
+    expect(json_['action'], equals('test'));
   });
 
   test('Can add and use named middleware', () async {
@@ -156,10 +155,11 @@ main() {
 
   test('Can serialize function result as JSON', () async {
     Map headers = {'Content-Type': 'application/json'};
-    String postData = JSON.encode({'it': 'works'});
+    String postData = json.encode({'it': 'works'});
     var response =
         await client.post("$url/lambda", headers: headers, body: postData);
-    expect(JSON.decode(response.body)['it'], equals('works'));
+    print('Response: ${response.body}');
+    expect(json.decode(response.body)['it'], equals('works'));
   });
 
   test('Fallback routes', () async {
@@ -178,14 +178,14 @@ main() {
   test('Redirect to named routes', () async {
     var response = await client.get('$url/named');
     print(response.body);
-    expect(JSON.decode(response.body), equals('Hello tests'));
+    expect(json.decode(response.body), equals('Hello tests'));
   });
 
   test('Match routes, even with query params', () async {
     var response =
         await client.get("$url/log?foo=bar&bar=baz&baz.foo=bar&baz.bar=foo");
     print(response.body);
-    expect(JSON.decode(response.body), equals('Logged'));
+    expect(json.decode(response.body), equals('Logged'));
 
     response = await client.get("$url/query/foo?bar=baz");
     print(response.body);
diff --git a/test/server_test.dart b/test/server_test.dart
index fec73b5f..558ffbaa 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
-import 'dart:convert';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:matcher/matcher.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
@@ -51,7 +51,7 @@ main() {
       ContentType.HTML.mimeType,
     );
     expect(rs.statusCode, e.statusCode);
-    var body = await rs.transform(UTF8.decoder).join();
+    var body = await rs.transform(utf8.decoder).join();
     expect(body, contains('<title>${e.message}</title>'));
     expect(body, contains('<li>foo</li>'));
     expect(body, contains('<li>bar</li>'));
@@ -59,9 +59,7 @@ main() {
 
   test('plug-ins run on startup', () async {
     var app = new Angel();
-    app.startupHooks.add((app) async {
-      app.configuration['two'] = 2;
-    });
+    app.startupHooks.add((app) => app.configuration['two'] = 2);
 
     var http = new AngelHttp(app);
     await http.startServer();
@@ -92,8 +90,8 @@ main() {
     app.get('/', (String a) => a);
     var rq = new MockHttpRequest('GET', Uri.parse('/'))..close();
     await http.handleRequest(rq);
-    var body = await rq.response.transform(UTF8.decoder).join();
-    expect(body, JSON.encode('b'));
+    var body = await rq.response.transform(utf8.decoder).join();
+    expect(body, json.encode('b'));
   });
 
   test('global injected serializer', () async {
@@ -102,7 +100,7 @@ main() {
     app.get($foo.path, (req, ResponseContext res) => res.serialize(null));
     var rq = new MockHttpRequest('GET', $foo)..close();
     await http.handleRequest(rq);
-    var body = await rq.response.transform(UTF8.decoder).join();
+    var body = await rq.response.transform(utf8.decoder).join();
     expect(body, 'x');
   });
 
@@ -157,7 +155,7 @@ main() {
       app.get('/wtf', () => throw new AngelHttpException.forbidden());
       app.get('/wtf2', () => throw new AngelHttpException.forbidden());
       http = new AngelHttp(app);
-      await http.startServer(InternetAddress.LOOPBACK_IP_V4, 0);
+      await http.startServer('127.0.0.1', 0);
 
       var oldHandler = app.errorHandler;
       app.errorHandler = (e, req, res) {
@@ -208,9 +206,9 @@ class CustomCloseService extends Service {
   int value = 2;
 
   @override
-  Future close() {
+  void close() {
     value = 3;
-    return super.close();
+    super.close();
   }
 }
 
diff --git a/test/services_test.dart b/test/services_test.dart
index a8909aaa..7ea687fe 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -1,7 +1,8 @@
-import 'dart:convert';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:http/http.dart' as http;
 import 'package:json_god/json_god.dart' as god;
+import 'package:stack_trace/stack_trace.dart';
 import 'package:test/test.dart';
 
 class Todo extends Model {
@@ -23,7 +24,7 @@ main() {
       ..use('/todos', new TypedService<Todo>(new MapService()))
       ..errorHandler = (e, req, res) {
         print('Whoops: ${e.error}');
-        print(e.stackTrace);
+        if (e.stackTrace != null) print(new Chain.forTrace(e.stackTrace).terse);
       };
 
     var server = await new AngelHttp(app).startServer();
@@ -45,7 +46,7 @@ main() {
       print(response.body);
       expect(response.body, equals('[]'));
       print(response.body);
-      expect(JSON.decode(response.body).length, 0);
+      expect(json.decode(response.body).length, 0);
     });
 
     test('can create data', () async {
@@ -97,12 +98,12 @@ main() {
       String postData = god.serialize({'text': 'Hello, world!'});
       var created = await client
           .post("$url/todos", headers: headers, body: postData)
-          .then((r) => JSON.decode(r.body));
+          .then((r) => json.decode(r.body));
       var response = await client.delete("$url/todos/${created['id']}");
       expect(response.statusCode, 200);
-      var json = god.deserialize(response.body);
-      print(json);
-      expect(json['text'], equals('Hello, world!'));
+      var json_ = god.deserialize(response.body);
+      print(json_);
+      expect(json_['text'], equals('Hello, world!'));
     });
   });
 }
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index e2e9e489..798442ab 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -1,7 +1,8 @@
 import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
+import 'dart:io' show stderr;
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
+import 'package:dart2_constant/io.dart';
 import 'package:logging/logging.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
@@ -23,8 +24,8 @@ main() {
 
     app.injectEncoders(
       {
-        'deflate': ZLIB.encoder,
-        'gzip': GZIP.encoder,
+        'deflate': zlib.encoder,
+        'gzip': gzip.encoder,
       },
     );
 
@@ -73,7 +74,7 @@ main() {
   _expectHelloBye(String path) async {
     var rq = new MockHttpRequest('GET', Uri.parse(path))..close();
     await http.handleRequest(rq);
-    var body = await rq.response.transform(UTF8.decoder).join();
+    var body = await rq.response.transform(utf8.decoder).join();
     expect(body, 'Hello, world!bye');
   }
 
@@ -84,7 +85,7 @@ main() {
   test('cannot write after close', () async {
     var rq = new MockHttpRequest('GET', Uri.parse('/overwrite'))..close();
     await http.handleRequest(rq);
-    var body = await rq.response.transform(UTF8.decoder).join();
+    var body = await rq.response.transform(utf8.decoder).join();
 
     if (rq.response.statusCode != 32)
       throw 'overwrite should throw error; response: $body';
@@ -94,7 +95,7 @@ main() {
     try {
       var rq = new MockHttpRequest('GET', Uri.parse('/error'))..close();
       await http.handleRequest(rq);
-      var body = await rq.response.transform(UTF8.decoder).join();
+      var body = await rq.response.transform(utf8.decoder).join();
       throw 'addError should throw error; response: $body';
     } on StateError {
       // Should throw error...