diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 69c608f9..1f841d46 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -5,7 +5,7 @@
         <entry key="analyzer">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.31.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.1/lib" />
             </list>
           </value>
         </entry>
@@ -33,7 +33,7 @@
         <entry key="angel_route">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib" />
             </list>
           </value>
         </entry>
@@ -51,13 +51,6 @@
             </list>
           </value>
         </entry>
-        <entry key="barback">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+16/lib" />
-            </list>
-          </value>
-        </entry>
         <entry key="body_parser">
           <value>
             <list>
@@ -79,13 +72,6 @@
             </list>
           </value>
         </entry>
-        <entry key="cli_util">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/cli_util-0.1.2+1/lib" />
-            </list>
-          </value>
-        </entry>
         <entry key="code_buffer">
           <value>
             <list>
@@ -96,14 +82,14 @@
         <entry key="collection">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.9/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.10/lib" />
             </list>
           </value>
         </entry>
         <entry key="combinator">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/combinator-1.0.0-beta+7/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/combinator-1.0.0+3/lib" />
             </list>
           </value>
         </entry>
@@ -124,7 +110,7 @@
         <entry key="crypto">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.5/lib" />
             </list>
           </value>
         </entry>
@@ -152,21 +138,21 @@
         <entry key="front_end">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.9/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="glob">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="html">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.3+1/lib" />
             </list>
           </value>
         </entry>
@@ -180,7 +166,7 @@
         <entry key="http_multi_server">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.5/lib" />
             </list>
           </value>
         </entry>
@@ -212,13 +198,6 @@
             </list>
           </value>
         </entry>
-        <entry key="isolate">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-1.1.0/lib" />
-            </list>
-          </value>
-        </entry>
         <entry key="jael">
           <value>
             <list>
@@ -243,14 +222,21 @@
         <entry key="json_god">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="json_rpc_2">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_rpc_2-2.0.8/lib" />
             </list>
           </value>
         </entry>
         <entry key="kernel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.9/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.1/lib" />
             </list>
           </value>
         </entry>
@@ -264,7 +250,7 @@
         <entry key="matcher">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.2+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3/lib" />
             </list>
           </value>
         </entry>
@@ -306,7 +292,7 @@
         <entry key="node_preamble">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.2/lib" />
             </list>
           </value>
         </entry>
@@ -320,14 +306,14 @@
         <entry key="package_resolver">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="path">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.5.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.1/lib" />
             </list>
           </value>
         </entry>
@@ -341,7 +327,7 @@
         <entry key="pool">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.5/lib" />
             </list>
           </value>
         </entry>
@@ -369,7 +355,7 @@
         <entry key="shelf">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3+1/lib" />
             </list>
           </value>
         </entry>
@@ -383,14 +369,14 @@
         <entry key="shelf_static">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_web_socket">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+2/lib" />
             </list>
           </value>
         </entry>
@@ -425,7 +411,7 @@
         <entry key="stream_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.6/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.7+1/lib" />
             </list>
           </value>
         </entry>
@@ -453,7 +439,7 @@
         <entry key="test">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.36/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.42/lib" />
             </list>
           </value>
         </entry>
@@ -478,101 +464,107 @@
             </list>
           </value>
         </entry>
+        <entry key="vm_service_client">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/vm_service_client-0.2.4+3/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="watcher">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+7/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+8/lib" />
             </list>
           </value>
         </entry>
         <entry key="web_socket_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.7/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.8/lib" />
             </list>
           </value>
         </entry>
         <entry key="yaml">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.13/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.14/lib" />
             </list>
           </value>
         </entry>
       </option>
     </properties>
     <CLASSES>
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.31.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_jael-1.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.5/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.4.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-2.0.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+16/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.1.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/cli_util-0.1.2+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/code_buffer-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.9/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/combinator-1.0.0-beta+7/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.10/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/combinator-1.0.0+3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/dart2_constant-1.0.1+dart2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/file-2.3.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.9/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.3+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+16/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/intl-0.15.6/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/io-0.3.2+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-1.1.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael-1.0.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael_preprocessor-1.0.0+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.9/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_rpc_2-2.0.8/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.2+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.6+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/multi_server_socket-1.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.5.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/quiver_hashcode-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.7+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/symbol_table-1.0.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.36/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.42/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.13/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/vm_service_client-0.2.4+3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+8/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.8/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.14/lib" />
     </CLASSES>
     <JAVADOC />
     <LIBRARY_FILE />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 99d3b52f..36f5c394 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,9 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Fix hooking bug">
+      <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/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$/lib/hooks.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/hooks.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/metrics.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/anonymous_service.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/core/typed_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/typed_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_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" />
+      <change beforePath="$PROJECT_DIR$/lib/src/stats/stats.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/util.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/accepts_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/accepts_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/controller_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/controller_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/di_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/di_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/hooked_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/hooked_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/primitives_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/primitives_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/serialize_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/serialize_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" />
+      <change beforePath="$PROJECT_DIR$/test/typed_service_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/typed_service_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -26,20 +60,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <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="4064">
-              <caret line="254" column="9" selection-start-line="254" selection-start-column="9" selection-end-line="254" selection-end-column="9" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1760">
-              <caret line="110" column="21" selection-start-line="110" selection-start-column="21" selection-end-line="110" selection-end-column="21" />
+            <state relative-caret-position="136">
+              <caret line="127" column="57" selection-start-line="127" selection-start-column="57" selection-end-line="127" selection-end-column="57" />
             </state>
           </provider>
         </entry>
@@ -47,8 +72,8 @@
       <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1024">
-              <caret line="69" column="4" selection-start-line="69" selection-start-column="4" selection-end-line="69" selection-end-column="4" />
+            <state relative-caret-position="32">
+              <caret line="2" column="54" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
             </state>
           </provider>
         </entry>
@@ -56,64 +81,78 @@
       <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/server_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2608">
-              <caret line="169" column="4" selection-start-line="169" selection-start-column="4" selection-end-line="169" selection-end-column="4" />
+            <state relative-caret-position="146">
+              <caret line="193" column="41" selection-start-line="193" selection-start-column="41" selection-end-line="193" selection-end-column="41" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="http.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="144">
-              <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
+            <state relative-caret-position="120">
+              <caret line="120" column="39" selection-start-line="120" selection-start-column="39" selection-end-line="120" selection-end-column="39" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="travis.sh" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tool/travis.sh">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file leaf-file-name="di_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <file leaf-file-name="typed_service_test.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1248">
-              <caret line="83" column="14" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="14" />
+            <state relative-caret-position="109">
+              <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <file leaf-file-name="serialize_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="152">
-              <caret line="27" column="15" selection-start-line="27" selection-start-column="15" selection-end-line="27" selection-end-column="15" />
+            <state relative-caret-position="146">
+              <caret line="17" column="71" selection-start-line="17" selection-start-column="71" selection-end-line="17" selection-end-column="71" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="272">
-              <caret line="543" column="26" lean-forward="true" selection-start-line="543" selection-start-column="26" selection-end-line="543" selection-end-column="26" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="core.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
+      <file leaf-file-name="accepts_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state>
+              <caret column="20" selection-start-column="20" selection-end-column="20" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="146">
+              <caret line="97" column="49" selection-start-line="97" selection-start-column="49" selection-end-line="97" selection-end-column="49" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="exception_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="34">
+              <caret line="17" column="27" lean-forward="true" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
               <folding>
-                <element signature="e#0#25#0" expanded="true" />
+                <element signature="e#1#55#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="angel_http_exception.dart" pinned="false" current-in-tab="false">
+        <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="142">
+              <caret line="51" column="61" selection-start-line="51" selection-start-column="61" selection-end-line="51" selection-end-column="61" />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -126,19 +165,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <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>
@@ -156,13 +182,21 @@
       <find>handleAnge</find>
       <find>errorHandl</find>
       <find>handl</find>
+      <find>HttpHeaders.ACCEPT</find>
+      <find>HttpHeaders.CONTENT_TYPE</find>
+      <find>HttpHeaders.CONTE</find>
+      <find>HttpHeaders</find>
+      <find>HttpStatus.FORBIDDEN</find>
+      <find>HttpStatus.</find>
+      <find>JSON</find>
+      <find>ContentType.JSON.toString()</find>
+      <find>(req, res)</find>
+      <find>headers: headers,</find>
+      <find>_</find>
+      <find>ContentType.HTML.mimeType</find>
+      <find>ContentType.JSON.mimeType</find>
     </findStrings>
     <replaceStrings>
-      <replace>modify</replace>
-      <replace>update</replace>
-      <replace>remove</replace>
-      <replace>data</replace>
-      <replace>event</replace>
       <replace>after</replace>
       <replace>fatalErrorStream</replace>
       <replace>onController</replace>
@@ -174,7 +208,6 @@
       <replace>req.path</replace>
       <replace>req.path`</replace>
       <replace>autoSnakeCaseNames == false ? $0 : '$1ated_at'</replace>
-      <replace>'content-type'</replace>
       <replace>appa</replace>
       <replace>isClosed</replace>
       <replace>useStream</replace>
@@ -186,6 +219,14 @@
       <replace />
       <replace>=</replace>
       <replace>{</replace>
+      <replace>'accept'</replace>
+      <replace>'content-type'</replace>
+      <replace>403</replace>
+      <replace>(RequestContext req, res)</replace>
+      <replace>headers: headers.cast&lt;String, String&gt;(),</replace>
+      <replace>this.</replace>
+      <replace>'text/html'</replace>
+      <replace>'application/json'</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -195,6 +236,7 @@
       <dir>$PROJECT_DIR$/test</dir>
       <dir>$PROJECT_DIR$/lib/src/core</dir>
       <dir>$PROJECT_DIR$/lib</dir>
+      <dir>$PROJECT_DIR$</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -208,57 +250,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/angel_framework.dart" />
-        <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
-        <option value="$PROJECT_DIR$/lib/http.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/anonymous_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$/README.md" />
-        <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/src/response.dart" />
-        <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/routable.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$/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/service.dart" />
-        <option value="$PROJECT_DIR$/test/services_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
         <option value="$PROJECT_DIR$/.travis.yml" />
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/example/async.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/example/view.dart" />
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/example/templating.dart" />
         <option value="$PROJECT_DIR$/example/views/index.jl" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/analysis_options.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/stats/stats.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/util.dart" />
+        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
+        <option value="$PROJECT_DIR$/test/services_test.dart" />
+        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
+        <option value="$PROJECT_DIR$/lib/hooks.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
+        <option value="$PROJECT_DIR$/test/di_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
-        <option value="$PROJECT_DIR$/test/di_test.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
+        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
+        <option value="$PROJECT_DIR$/test/accepts_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/test/exception_test.dart" />
+        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+        <option value="$PROJECT_DIR$/test/serialize_test.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
+        <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
       </list>
     </option>
   </component>
@@ -272,10 +314,10 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="50" />
-    <option name="y" value="23" />
-    <option name="width" value="1360" />
-    <option name="height" value="797" />
+    <option name="x" value="26" />
+    <option name="y" value="22" />
+    <option name="width" value="1326" />
+    <option name="height" value="772" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
@@ -285,9 +327,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-      <pane id="ProjectPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -309,14 +348,15 @@
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="core" type="cbb8eebc:String" user="core" />
+              <item name="test" type="cbb8eebc:String" user="test" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="ProjectPane" />
+      <pane id="AndroidView" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -358,7 +398,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests">
+  <component name="RunManager" selected="Dart Command Line App.main.dart">
     <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" />
@@ -635,14 +675,10 @@
       <workItem from="1528668755509" duration="1661000" />
       <workItem from="1528671477893" duration="1263000" />
       <workItem from="1529435353495" duration="592000" />
-      <workItem from="1529523346006" duration="479000" />
-    </task>
-    <task id="LOCAL-00039" summary="+6">
-      <created>1507654580167</created>
-      <option name="number" value="00039" />
-      <option name="presentableId" value="LOCAL-00039" />
-      <option name="project" value="LOCAL" />
-      <updated>1507654580167</updated>
+      <workItem from="1529523346006" duration="682000" />
+      <workItem from="1529713102021" duration="161000" />
+      <workItem from="1529722767717" duration="59000" />
+      <workItem from="1529722829709" duration="1693000" />
     </task>
     <task id="LOCAL-00040" summary="autoIdAndDateFields in MapService">
       <created>1511026951368</created>
@@ -980,13 +1016,17 @@
       <option name="project" value="LOCAL" />
       <updated>1528672631392</updated>
     </task>
-    <option name="localTasksCounter" value="88" />
+    <task id="LOCAL-00088" summary="Fix hooking bug">
+      <created>1529523884120</created>
+      <option name="number" value="00088" />
+      <option name="presentableId" value="LOCAL-00088" />
+      <option name="project" value="LOCAL" />
+      <updated>1529523884121</updated>
+    </task>
+    <option name="localTasksCounter" value="89" />
     <servers />
   </component>
   <component name="TestHistory">
-    <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>
@@ -1014,9 +1054,12 @@
     <history-entry file="All_Tests - 2018.06.10 at 19h 15m 55s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2018.06.20 at 15h 44m 03s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="149669000" />
+    <option name="totallyTimeSpent" value="151785000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1028,7 +1071,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="50" y="23" width="1360" height="797" extended-state="0" />
+    <frame x="26" y="22" width="1326" height="772" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
@@ -1036,7 +1079,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="bottom" id="Dart Analysis" order="7" weight="0.31111112" />
       <window_info anchor="right" id="Flutter Outline" order="4" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -1047,13 +1090,15 @@
       <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.32714286" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.33481482" />
       <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="Run" order="2" sideWeight="0.4964476" weight="0.4" />
       <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.2518968" />
+      <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.48" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27024922" />
+      <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" />
@@ -1064,8 +1109,6 @@
       <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="bottom" id="Messages" order="7" weight="0.32285714" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <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" />
@@ -1079,7 +1122,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Create HttpRequestContextImpl" />
     <MESSAGE value="Change return type of `AngelHttp.createRequestContext`" />
     <MESSAGE value="Deprecated `ResponseContext.io`, added HTTP equivalent" />
     <MESSAGE value="Removed `HttpHeaders` in `ResponseContext`" />
@@ -1104,7 +1146,8 @@
     <MESSAGE value="1.1.4+1" />
     <MESSAGE value="1.1.4+2" />
     <MESSAGE value="Fix async bugs" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fix async bugs" />
+    <MESSAGE value="Fix hooking bug" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fix hooking bug" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1112,156 +1155,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <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" />
-        </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" />
-        </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" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/json.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="20" selection-start-column="20" selection-end-column="20" />
-        </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" />
-        </state>
-      </provider>
-    </entry>
-    <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" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/opt/dart/libexec/lib/_http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <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$/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" />
-        </state>
-      </provider>
-    </entry>
-    <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="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://$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:///usr/local/opt/dart/libexec/lib/async/async.dart">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <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/test-0.12.36/lib/src/frontend/expect.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <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/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <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$/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" />
-        </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" />
-        </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="3520">
-          <caret line="229" column="26" selection-start-line="229" selection-start-column="26" selection-end-line="229" selection-end-column="26" />
-        </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">
@@ -1269,20 +1162,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="28" column="33" lean-forward="true" selection-start-line="28" selection-start-column="33" selection-end-line="28" selection-end-column="33" />
-        </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="131">
-          <caret line="16" column="24" lean-forward="true" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.travis.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="48">
@@ -1290,27 +1169,6 @@
         </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="83">
-          <caret line="23" column="19" lean-forward="true" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
-        </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="243">
-          <caret line="237" column="31" lean-forward="true" selection-start-line="237" selection-start-column="31" selection-end-line="237" selection-end-column="31" />
-        </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="496">
-          <caret line="31" selection-start-line="31" selection-end-line="31" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/view.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="112">
@@ -1367,73 +1225,19 @@
         </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="90">
-          <caret line="307" column="5" lean-forward="true" selection-start-line="307" selection-start-column="5" selection-end-line="307" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/templating.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
           <caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
-        </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="118">
-          <caret line="207" lean-forward="true" selection-start-line="207" selection-end-line="207" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#0#25#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1248">
-          <caret line="83" column="14" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="14" />
-        </state>
-      </provider>
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/tool/travis.sh">
       <provider selected="true" editor-type-id="text-editor" />
     </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="51" selection-start-line="3" selection-start-column="51" selection-end-line="3" selection-end-column="51" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1760">
-          <caret line="110" column="21" selection-start-line="110" selection-start-column="21" selection-end-line="110" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1024">
-          <caret line="69" column="4" selection-start-line="69" selection-start-column="4" selection-end-line="69" selection-end-column="4" />
-        </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="144">
@@ -1441,31 +1245,271 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib/src/validation.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2608">
-          <caret line="169" column="4" selection-start-line="169" selection-start-column="4" selection-end-line="169" selection-end-column="4" />
+        <state relative-caret-position="96">
+          <caret line="6" column="21" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/analysis_options.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="32">
+          <caret line="2" column="25" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" />
+        </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="400">
+          <caret line="29" column="33" selection-start-line="29" selection-start-column="33" selection-end-line="29" selection-end-column="33" />
+        </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="168">
+          <caret line="155" column="15" lean-forward="true" selection-start-line="155" selection-start-column="15" selection-end-line="155" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="47" column="57" selection-start-line="47" selection-start-column="57" selection-end-line="47" selection-end-column="57" />
         </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="4064">
-          <caret line="254" column="9" selection-start-line="254" selection-start-column="9" selection-end-line="254" selection-end-column="9" />
+        <state relative-caret-position="403">
+          <caret line="128" column="27" selection-start-line="128" selection-start-column="27" selection-end-line="128" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="27" column="15" selection-start-line="27" selection-start-column="15" selection-end-line="27" selection-end-column="15" />
+        <state relative-caret-position="130">
+          <caret line="33" column="69" selection-start-line="33" selection-start-column="69" selection-end-line="33" selection-end-column="69" />
+        </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="32">
+            <caret line="2" column="33" selection-start-line="2" selection-start-column="33" selection-end-line="2" selection-end-column="33" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="22" column="66" selection-start-line="22" selection-start-column="66" selection-end-line="22" selection-end-column="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/stats/stats.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="33" column="21" lean-forward="true" selection-start-line="33" selection-start-column="21" selection-end-line="33" selection-end-column="21" />
+        </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="1152">
+          <caret line="76" column="11" selection-start-line="76" selection-start-column="11" selection-end-line="76" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="256">
+          <caret line="20" column="68" selection-start-line="20" selection-start-column="68" selection-end-line="20" selection-end-column="68" />
+        </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="322">
+          <caret line="81" column="32" selection-start-line="81" selection-start-column="32" selection-end-line="81" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="122">
+          <caret line="69" column="7" lean-forward="true" selection-start-line="69" selection-start-column="7" selection-end-line="69" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="162">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="372">
+          <caret line="148" column="57" selection-start-line="148" selection-start-column="57" selection-end-line="148" selection-end-column="57" />
+        </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="64">
+          <caret line="5" column="28" lean-forward="true" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="146">
+          <caret line="79" column="40" selection-start-line="79" selection-start-column="40" selection-end-line="79" selection-end-column="40" />
+        </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="293">
+          <caret line="154" column="25" lean-forward="true" selection-start-line="154" selection-start-column="25" selection-end-line="154" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib/src/router.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="236">
+          <caret line="35" column="23" selection-start-line="35" selection-start-column="23" selection-end-line="35" selection-end-column="23" />
+        </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="325">
+          <caret line="145" column="66" selection-start-line="145" selection-start-column="66" selection-end-line="145" selection-end-column="66" />
+          <folding>
+            <element signature="e#40#60#0" expanded="true" />
+          </folding>
+        </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="146">
+          <caret line="100" column="43" selection-start-line="100" selection-start-column="43" selection-end-line="100" selection-end-column="43" />
         </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="272">
-          <caret line="543" column="26" lean-forward="true" selection-start-line="543" selection-start-column="26" selection-end-line="543" selection-end-column="26" />
+        <state relative-caret-position="32">
+          <caret line="2" column="20" selection-start-line="2" selection-start-column="20" selection-end-line="2" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="224">
+          <caret line="14" column="19" lean-forward="true" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="408">
+          <caret line="63" column="49" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
+        </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="146">
+          <caret line="204" column="44" selection-start-line="204" selection-start-column="44" selection-end-line="204" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="360">
+          <caret line="102" column="52" selection-start-line="102" selection-start-column="52" selection-end-line="102" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="136">
+          <caret line="127" column="57" selection-start-line="127" selection-start-column="57" selection-end-line="127" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="20" selection-start-column="20" selection-end-column="20" />
+        </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="146">
+          <caret line="97" column="49" selection-start-line="97" selection-start-column="49" selection-end-line="97" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="32">
+          <caret line="2" column="54" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="146">
+          <caret line="17" column="71" selection-start-line="17" selection-start-column="71" selection-end-line="17" selection-end-column="71" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="146">
+          <caret line="193" column="41" selection-start-line="193" selection-start-column="41" selection-end-line="193" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="120" column="39" selection-start-line="120" selection-start-column="39" selection-end-line="120" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="17" column="27" lean-forward="true" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
+          <folding>
+            <element signature="e#1#55#0" expanded="true" />
+          </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="142">
+          <caret line="51" column="61" selection-start-line="51" selection-start-column="61" selection-end-line="51" selection-end-column="61" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="109">
+          <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a40f76bf..557ac482 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 1.1.4+5
+* Intermediary release while patching up Dart 2 bugs.
+* Stricter Dart 2 use.
+* Remove `AngelMetrics` for good.
+
 # 1.1.4+4
 * Fix a bug that caused a race condition in hooked services.
 
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 1167d894..a0ee1ea1 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,5 +1,6 @@
 analyzer:
-  strong-mode: true
+  strong-mode:
+    implicit-casts: false
 linter:
   rules:
     - avoid_slow_async_io
\ No newline at end of file
diff --git a/lib/hooks.dart b/lib/hooks.dart
index bcce6141..0b50dccd 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -141,12 +141,12 @@ HookedServiceEventListener remove(key, [remover(key, obj)]) {
       else if (obj is List)
         return obj..remove(key);
       else if (obj is Iterable)
-        return obj.where((k) => !key);
+        return obj.where((k) => key != true);
       else if (obj is Map)
         return obj..remove(key);
       else {
         try {
-          reflect(obj).setField(new Symbol(key), null);
+          reflect(obj).setField(new Symbol(key.toString()), null);
           return obj;
         } catch (e) {
           throw new ArgumentError("Cannot remove key '$key' from $obj.");
diff --git a/lib/metrics.dart b/lib/metrics.dart
deleted file mode 100644
index b4ecfdf1..00000000
--- a/lib/metrics.dart
+++ /dev/null
@@ -1,2 +0,0 @@
-export 'src/stats/metric_server.dart';
-export 'src/stats/stats.dart';
diff --git a/lib/src/core/anonymous_service.dart b/lib/src/core/anonymous_service.dart
index d263dca6..0faf3b12 100644
--- a/lib/src/core/anonymous_service.dart
+++ b/lib/src/core/anonymous_service.dart
@@ -5,15 +5,17 @@ import 'service.dart';
 ///
 /// Well-suited for testing.
 class AnonymousService extends Service {
-  Function _index, _read, _create, _modify, _update, _remove;
+  Future Function([Map]) _index;
+  Future Function(Object, [Map]) _read, _create, _remove;
+  Future Function(Object, Object, [Map]) _modify, _update;
 
   AnonymousService(
-      {FutureOr index([Map params]),
-      FutureOr read(id, [Map params]),
-      FutureOr create(data, [Map params]),
-      FutureOr modify(id, data, [Map params]),
-      FutureOr update(id, data, [Map params]),
-      FutureOr remove(id, [Map params])})
+      {Future index([Map params]),
+      Future read(id, [Map params]),
+      Future create(data, [Map params]),
+      Future modify(id, data, [Map params]),
+      Future update(id, data, [Map params]),
+      Future remove(id, [Map params])})
       : super() {
     _index = index;
     _read = read;
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index 3fae479c..17dc5b31 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -1,8 +1,6 @@
 library angel_framework.http;
 
 import 'dart:async';
-import 'package:angel_http_exception/angel_http_exception.dart';
-import 'package:merge_map/merge_map.dart';
 import '../util.dart';
 import 'request_context.dart';
 import 'response_context.dart';
@@ -48,12 +46,12 @@ class HookedService extends Service {
 
   RequestContext _getRequest(Map params) {
     if (params == null) return null;
-    return params['__requestctx'];
+    return params['__requestctx'] as RequestContext;
   }
 
   ResponseContext _getResponse(Map params) {
     if (params == null) return null;
-    return params['__responsectx'];
+    return params['__responsectx'] as ResponseContext;
   }
 
   Map _stripReq(Map params) {
@@ -88,8 +86,7 @@ class HookedService extends Service {
   /// Adds hooks to this instance.
   void addHooks() {
     Hooks hooks = getAnnotation(inner, Hooks);
-    final before = [];
-    final after = [];
+    List<HookedServiceEventListener> before = [], after = [];
 
     if (hooks != null) {
       before.addAll(hooks.before);
@@ -99,7 +96,8 @@ class HookedService extends Service {
     void applyListeners(Function fn, HookedServiceEventDispatcher dispatcher,
         [bool isAfter]) {
       Hooks hooks = getAnnotation(fn, Hooks);
-      final listeners = []..addAll(isAfter == true ? after : before);
+      final listeners = <HookedServiceEventListener>[]
+        ..addAll(isAfter == true ? after : before);
 
       if (hooks != null)
         listeners.addAll(isAfter == true ? hooks.after : hooks.before);
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index b9594642..5952fded 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -5,7 +5,7 @@ const List<Type> _primitiveTypes = const [String, int, num, double, Null];
 /// Shortcut for calling [preInject], and then [handleContained].
 ///
 /// Use this to instantly create a request handler for a DI-enabled method.
-RequestHandler createDynamicHandler(handler,
+RequestHandler createDynamicHandler(Function handler,
     {Iterable<String> optional: const []}) {
   var injection = preInject(handler);
   injection.optional.addAll(optional ?? []);
@@ -77,7 +77,7 @@ bool suitableForInjection(
 }
 
 /// Handles a request with a DI-enabled handler.
-RequestHandler handleContained(handler, InjectionRequest injection) {
+RequestHandler handleContained(Function handler, InjectionRequest injection) {
   return (RequestContext req, ResponseContext res) {
     if (injection.parameters.isNotEmpty &&
         injection.parameters.values.any((p) => p.match != null) &&
diff --git a/lib/src/core/map_service.dart b/lib/src/core/map_service.dart
index 3f2d9e90..a405834a 100644
--- a/lib/src/core/map_service.dart
+++ b/lib/src/core/map_service.dart
@@ -77,7 +77,7 @@ class MapService extends Service {
           message:
               'MapService does not support `create` with ${data.runtimeType}.');
     var now = new DateTime.now().toIso8601String();
-    var result = data;
+    var result = data as Map;
 
     if (autoIdAndDateFields == true) {
       result
@@ -85,7 +85,7 @@ class MapService extends Service {
         ..[autoSnakeCaseNames == false ? 'createdAt' : 'created_at'] = now
         ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] = now;
     }
-    items.add(result);
+    items.add(result.cast<String, dynamic>());
     return new Future.value(result);
   }
 
@@ -98,7 +98,7 @@ class MapService extends Service {
     if (!items.any(_matchesId(id))) return create(data, params);
 
     return read(id).then((item) {
-      var result = item..addAll(data);
+      var result = item..addAll(data as Map);
 
       if (autoIdAndDateFields == true)
         result
@@ -121,7 +121,7 @@ class MapService extends Service {
         throw new AngelHttpException.notFound(
             message: 'No record found for ID $id');
 
-      var result = data;
+      var result = data as Map;
       if (autoIdAndDateFields == true) {
         result
           ..['id'] = id?.toString()
@@ -130,7 +130,7 @@ class MapService extends Service {
           ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
               new DateTime.now().toIso8601String();
       }
-      items.add(result);
+      items.add(result.cast<String, dynamic>());
       return new Future.value(result);
     });
   }
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index c926c792..36ad5210 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -144,18 +144,18 @@ abstract class RequestContext {
   /// within a service hook.
   T grab<T>(key) {
     if (params.containsKey(key))
-      return params[key];
+      return params[key] as T;
     else if (_injections.containsKey(key))
-      return _injections[key];
+      return _injections[key] as T;
     else if (properties.containsKey(key))
-      return properties[key];
+      return properties[key] as T;
     else {
       var prop = app?.findProperty(key);
       if (prop != null)
-        return prop;
+        return prop as T;
       else if (key is Type) {
         try {
-          return app.container.make(key);
+          return app.container.make(key) as T;
         } catch (e) {
           return null;
         }
@@ -195,7 +195,7 @@ abstract class RequestContext {
       throw new ArgumentError(
           'RequestContext.accepts expects the `contentType` parameter to NOT be null.');
 
-    _acceptHeaderCache ??= headers.value(HttpHeaders.ACCEPT);
+    _acceptHeaderCache ??= headers.value('accept');
 
     if (_acceptHeaderCache == null)
       return false;
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 25f0445a..6330fad6 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -179,7 +179,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   }
 
   /// Serializes JSON to the response.
-  void json(value) => serialize(value, contentType: ContentType.JSON);
+  void json(value) => serialize(value, contentType: 'application/json');
 
   /// Returns a JSONP response.
   void jsonp(value, {String callbackName: "callback", contentType}) {
@@ -202,7 +202,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
     if (!isOpen) throw closed();
     return app.viewGenerator(view, data).then((content) {
       write(content);
-      headers['content-type'] = ContentType.HTML.toString();
+      headers['content-type'] = 'text/html';
       end();
     });
   }
@@ -217,9 +217,9 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   void redirect(url, {bool absolute: true, int code: 302}) {
     if (!isOpen) throw closed();
     headers
-      ..['content-type'] = ContentType.HTML.toString()
+      ..['content-type'] = 'text/html'
       ..['location'] =
-          url is String ? url : app.navigate(url, absolute: absolute);
+          url is String ? url : app.navigate(url as Iterable, absolute: absolute);
     statusCode = code ?? 302;
     write('''
     <!DOCTYPE html>
@@ -259,7 +259,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
     Route matched = _findRoute(app);
 
     if (matched != null) {
-      redirect(matched.makeUri(params), code: code);
+      redirect(matched.makeUri(params.cast<String, dynamic>()), code: code);
       return;
     }
 
@@ -290,7 +290,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
 
     final head =
         controller.findExpose().path.toString().replaceAll(_straySlashes, '');
-    final tail = matched.makeUri(params).replaceAll(_straySlashes, '');
+    final tail = matched.makeUri(params.cast<String, dynamic>()).replaceAll(_straySlashes, '');
 
     redirect('$head/$tail'.replaceAll(_straySlashes, ''), code: code);
   }
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index 8dafb635..f39ae109 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -8,6 +8,7 @@ import 'hooked_service.dart';
 import 'metadata.dart';
 import 'request_context.dart';
 import 'response_context.dart';
+import 'server.dart';
 import 'service.dart';
 
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
@@ -16,7 +17,7 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 typedef Future<bool> RequestMiddleware(RequestContext req, ResponseContext res);
 
 /// A function that receives an incoming [RequestContext] and responds to it.
-typedef Future RequestHandler(RequestContext req, ResponseContext res);
+typedef FutureOr 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.
@@ -31,8 +32,9 @@ RequestMiddleware waterfall(List handlers) {
         runPipeline = () => req.app.executeHandler(handler, req, res);
       else {
         var current = runPipeline;
-        runPipeline = () => current().then((result) =>
-            !result ? result : req.app.executeHandler(handler, req, res));
+        runPipeline = () => current().then((result) => !result
+            ? new Future.value(result)
+            : req.app.executeHandler(handler, req, res));
       }
     }
 
@@ -97,7 +99,8 @@ class Routable extends Router {
     handlerSequence.addAll(middleware ?? []);
     handlerSequence.addAll(handlers);
 
-    return super.addRoute(method, path, handler, middleware: handlerSequence);
+    return super.addRoute(method, path.toString(), handler,
+        middleware: handlerSequence);
   }
 
   /// Mounts the given [router] on this instance.
@@ -128,8 +131,8 @@ class Routable extends Router {
 
     if (_router is AngelBase) {
       handlers.add((RequestContext req, ResponseContext res) {
-        req.app = _router;
-        res.app = _router;
+        req.app = _router as Angel;
+        res.app = _router as Angel;
         return true;
       });
     }
@@ -140,7 +143,7 @@ class Routable extends Router {
     Map copiedMiddleware = new Map.from(router.requestMiddleware);
     for (String middlewareName in copiedMiddleware.keys) {
       requestMiddleware.putIfAbsent("$middlewarePrefix$middlewareName",
-          () => copiedMiddleware[middlewareName]);
+          () => copiedMiddleware[middlewareName] as RequestHandler);
     }
 
     // Also copy properties...
@@ -154,7 +157,7 @@ class Routable extends Router {
 
     // _router.dumpTree(header: 'Mounting on "$path":');
     // root.child(path, debug: debug, handlers: handlers).addChild(router.root);
-    var mounted = mount(path, _router);
+    var mounted = mount(path.toString(), _router);
 
     if (_router is Routable) {
       // Copy services, too. :)
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index f9d07318..7029bb4f 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -31,7 +31,7 @@ typedef FutureOr AngelConfigurer(Angel app);
 /// A powerful real-time/REST/MVC server class.
 class Angel extends AngelBase {
   final List<Angel> _children = [];
-  final Map<String, Tuple3<List, Map, ParseResult<Map<String, String>>>>
+  final Map<String, Tuple3<List, Map, ParseResult<Map<String, dynamic>>>>
       handlerCache = new HashMap();
 
   Router _flattened;
@@ -186,7 +186,7 @@ class Angel extends AngelBase {
           'This route will be ignored, and no requests will ever reach it.');
     }
     return super
-        .mount(path, router, hooked: hooked != false, namespace: namespace);
+        .mount(path.toString(), router, hooked: hooked != false, namespace: namespace);
   }
 
   /// Loads some base dependencies into the service container.
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 3cd6e6fd..ca59dbb0 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -117,7 +117,7 @@ class Service extends Routable {
     if (before != null) handlers.addAll(before.handlers);
 
     Middleware indexMiddleware = getAnnotation(service.index, Middleware);
-    get('/', (req, res) {
+    get('/', (RequestContext req, res) {
       return this.index(mergeMap([
         {'query': req.query},
         restProvider,
@@ -154,7 +154,7 @@ class Service extends Routable {
 
     get(
         '/:id',
-        (req, res) => this.read(
+        (RequestContext req, res) => this.read(
             toId(req.params['id']),
             mergeMap([
               {'query': req.query},
@@ -214,7 +214,7 @@ class Service extends Routable {
     Middleware removeMiddleware = getAnnotation(service.remove, Middleware);
     delete(
         '/',
-        (req, res) => this.remove(
+        (RequestContext req, res) => this.remove(
             null,
             mergeMap([
               {'query': req.query},
@@ -227,7 +227,7 @@ class Service extends Routable {
               (removeMiddleware == null) ? [] : removeMiddleware.handlers));
     delete(
         '/:id',
-        (req, res) => this.remove(
+        (RequestContext req, res) => this.remove(
             toId(req.params['id']),
             mergeMap([
               {'query': req.query},
diff --git a/lib/src/core/typed_service.dart b/lib/src/core/typed_service.dart
index 9ee37834..aa9821c9 100644
--- a/lib/src/core/typed_service.dart
+++ b/lib/src/core/typed_service.dart
@@ -37,15 +37,15 @@ class TypedService<T> extends Service {
       Model result = god.deserializeDatum(data, outputType: T);
 
       if (data['createdAt'] is DateTime) {
-        result.createdAt = data['createdAt'];
+        result.createdAt = data['createdAt'] as DateTime;
       } else if (data['created_at'] is DateTime) {
-        result.createdAt = data['created_at'];
+        result.createdAt = data['created_at'] as DateTime;
       }
 
       if (data['updatedAt'] is DateTime) {
-        result.updatedAt = data['updatedAt'];
+        result.updatedAt = data['updatedAt'] as DateTime;
       } else if (data['updated_at'] is DateTime) {
-        result.updatedAt = data['updated_at'];
+        result.updatedAt = data['updated_at'] as DateTime;
       }
 
       // print('x: $x\nresult: $result');
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 0c5ec736..7f9919be 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -112,7 +112,7 @@ class AngelHttp {
           var path = req.path;
           if (path == '/') path = '';
 
-          Tuple3<List, Map, ParseResult<Map<String, String>>> resolveTuple() {
+          Tuple3<List, Map, ParseResult<Map<String, dynamic>>> resolveTuple() {
             Router r = app.optimizedRouter;
             var resolved =
                 r.resolveAbsolute(path, method: req.method, strip: false);
@@ -147,7 +147,7 @@ class AngelHttp {
             else {
               var current = runPipeline;
               runPipeline = () => current().then((result) =>
-                  !result ? result : app.executeHandler(handler, req, res));
+                  !result ? new Future.value(result) : app.executeHandler(handler, req, res));
             }
           }
 
@@ -157,7 +157,7 @@ class AngelHttp {
         }
 
         if (useZone == false) {
-          return handle().catchError((e, st) {
+          return handle().catchError((e, StackTrace st) {
             if (e is FormatException)
               throw new AngelHttpException.badRequest(message: e.message)
                 ..stackTrace = st;
@@ -196,7 +196,7 @@ class AngelHttp {
                 }
 
                 return handleAngelHttpException(e, trace, req, res, request);
-              }).catchError((e, st) {
+              }).catchError((e, StackTrace st) {
                 var trace = new Trace.from(st ?? StackTrace.current).terse;
                 request.response.close();
                 // Ideally, we won't be in a position where an absolutely fatal error occurs,
@@ -353,7 +353,7 @@ class AngelHttp {
   Future<ResponseContext> createResponseContext(HttpResponse response,
           [RequestContext correspondingRequest]) =>
       new Future<ResponseContext>.value(
-          new HttpResponseContextImpl(response, app, correspondingRequest)
+          new HttpResponseContextImpl(response, app, correspondingRequest as HttpRequestContextImpl)
             ..serializer = (app.serializer ?? god.serialize)
             ..encoders.addAll(app.encoders ?? {}));
 
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 40493bb2..f4e8005b 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)  {
+  Future configureServer(Angel app) {
     _app = app;
 
     if (injectSingleton != false) _app.container.singleton(this);
@@ -59,7 +59,7 @@ class Controller {
     return new Future.value();
   }
 
-  Function _routeBuilder(
+  void Function(Symbol, MethodMirror) _routeBuilder(
       InstanceMirror instanceMirror, Routable routable, List handlers) {
     return (Symbol methodName, MethodMirror method) {
       if (method.isRegularMethod &&
@@ -74,7 +74,8 @@ class Controller {
 
         if (exposeDecl == null) return;
 
-        var reflectedMethod = instanceMirror.getField(methodName).reflectee;
+        var reflectedMethod =
+            instanceMirror.getField(methodName).reflectee as Function;
         var middleware = []..addAll(handlers)..addAll(exposeDecl.middleware);
         String name = exposeDecl.as?.isNotEmpty == true
             ? exposeDecl.as
@@ -86,9 +87,10 @@ class Controller {
             method.parameters[1].type.reflectedType == ResponseContext) {
           // Create a regular route
           routeMappings[name] = routable
-              .addRoute(exposeDecl.method, exposeDecl.path, (req, res)  {
-            var result =   reflectedMethod(req, res);
-            return result is RequestHandler ?   result(req, res) : result;
+              .addRoute(exposeDecl.method, exposeDecl.path,
+                  (RequestContext req, ResponseContext res) {
+            var result = reflectedMethod(req, res);
+            return result is RequestHandler ? result(req, res) : result;
           }, middleware: middleware);
           return;
         }
@@ -112,5 +114,5 @@ class Controller {
   Expose findExpose() => reflectClass(runtimeType)
       .metadata
       .map((m) => m.reflectee)
-      .firstWhere((r) => r is Expose, orElse: () => null);
+      .firstWhere((r) => r is Expose, orElse: () => null) as Expose;
 }
diff --git a/lib/src/http/http_request_context.dart b/lib/src/http/http_request_context.dart
index c483de8a..5de674e2 100644
--- a/lib/src/http/http_request_context.dart
+++ b/lib/src/http/http_request_context.dart
@@ -27,7 +27,7 @@ class HttpRequestContextImpl extends RequestContext {
 
   @override
   String get hostname {
-    return io.headers.value(HttpHeaders.HOST);
+    return io.headers.value('host');
   }
 
   /// The underlying [HttpRequest] instance underneath this context.
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index 56f3b324..a6f200ba 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -68,7 +68,7 @@ class HttpResponseContextImpl extends ResponseContext {
 
     if (encoders.isNotEmpty && correspondingRequest != null) {
       var allowedEncodings = correspondingRequest.headers
-          .value(HttpHeaders.ACCEPT_ENCODING)
+          .value('accept-encoding')
           ?.split(',')
           ?.map((s) => s.trim())
           ?.where((s) => s.isNotEmpty)
@@ -92,7 +92,7 @@ class HttpResponseContextImpl extends ResponseContext {
 
           if (encoder != null) {
             if (firstStream) {
-              io.headers.set(HttpHeaders.CONTENT_ENCODING, key);
+              io.headers.set('content-encoding', key);
             }
 
             output = encoders[key].bind(output);
diff --git a/lib/src/stats/metric_server.dart b/lib/src/stats/metric_server.dart
deleted file mode 100644
index 5aa7463a..00000000
--- a/lib/src/stats/metric_server.dart
+++ /dev/null
@@ -1,118 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-import '../core/core.dart';
-import '../http/http.dart';
-import 'stats.dart';
-
-@deprecated
-class AngelMetrics extends Angel {
-  Angel _inner;
-  StreamSubscription<HttpRequest> _sub;
-
-  AngelMetrics() : super() {
-    get('/metrics', (req, res) {
-      res.contentType = ContentType.HTML;
-
-      var rows = stats.all.map((stat) {
-        return '''
-          <tr>
-              <td>${stat.name}</td>
-              <td>${stat.iterations}</td>
-              <td>${stat.sum}ms</td>
-              <td>${stat.average.toStringAsFixed(2)}ms</td>
-            </tr>''';
-      }).join();
-
-      res.write('''
-        <!DOCTYPE html>
-        <html>
-          <head>
-            <meta name="viewport" content="width=device-width, initial-scale=1">
-            <title>Metrics</title>
-          </head>
-          <body>
-            <h1>Metrics</h1>
-            <i>Updated every 5 seconds</i>
-            <table>
-              <thead>
-                <tr>
-                  <th>Stat</th>
-                  <th># Iterations</th>
-                  <th>Total (ms)</th>
-                  <th>Average (ms)</th>
-                </tr>
-              </thead>
-              <tbody>$rows</tbody>
-            </table>
-            <script>
-              window.setTimeout(function() {
-                window.location.reload();
-              }, 5000);
-            </script>
-          </body>
-        </html>
-        ''');
-    });
-  }
-
-  final AngelMetricsStats stats = new AngelMetricsStats._();
-
-  @override
-  Future<HttpServer> close()  {
-    _sub?.cancel();
-      _inner.close();
-    return   super.close();
-  }
-
-  @override
-  Iterable<RoutingResult> resolveAll(String absolute, String relative,
-      {String method: 'GET', bool strip: true}) {
-    return stats.resolveAll.run(() =>
-        _inner.resolveAll(absolute, relative, method: method, strip: strip));
-  }
-
-  @override
-  Future<bool> executeHandler(
-      handler, RequestContext req, ResponseContext res) {
-    return stats.executeHandler
-        .run<bool>(() => super.executeHandler(handler, req, res));
-  }
-
-  @override
-  Future getHandlerResult(handler, RequestContext req, ResponseContext res) {
-    return stats.getHandlerResult
-        .run(() => super.getHandlerResult(handler, req, res));
-  }
-
-  @override
-  Future runContained(
-      Function handler, RequestContext req, ResponseContext res) {
-    return stats.runContained.run(() => super.runContained(handler, req, res));
-  }
-}
-
-class AngelMetricsStats {
-  AngelMetricsStats._() {
-    all = [
-      resolveAll,
-      executeHandler,
-      getHandlerResult,
-      runContained,
-    ];
-  }
-
-  final Stats resolveAll = new Stats('resolveAll');
-  final Stats executeHandler = new Stats('executeHandler');
-  final Stats getHandlerResult = new Stats('getHandlerResult');
-  final Stats runContained = new Stats('runContained');
-
-  List<Stats> all;
-
-  void add(Stats stats) {
-    all.add(stats);
-  }
-
-  void log() {
-    all.forEach((s) => s.log());
-  }
-}
diff --git a/lib/src/stats/stats.dart b/lib/src/stats/stats.dart
deleted file mode 100644
index 2c42a5dc..00000000
--- a/lib/src/stats/stats.dart
+++ /dev/null
@@ -1,53 +0,0 @@
-/// Computes averages progressively.
-
-import 'dart:async';
-
-class Stats {
-  final String name;
-
-  int _total = 0, _count = 0;
-  double _average = 0.0;
-
-  Stats(this.name);
-
-  double get average => _average ?? (_total / _count);
-
-  int get iterations => _count;
-
-  int get sum => _total;
-
-  void log() {
-    print('$name: $average avg.');
-  }
-
-  void add(int value) {
-    _average = null;
-    _total += value;
-    _count++;
-  }
-
-  FutureOr<T> run<T>(FutureOr<T> f()) {
-    var sw = new Stopwatch();
-    //print('--- $name START');
-    sw.start();
-
-    void whenDone() {
-      sw.stop();
-      var ms = sw.elapsedMilliseconds;
-      add(ms);
-      //print('--- $name DONE after ${ms}ms');
-    }
-
-    var r = f();
-
-    if (r is Future) {
-      return (r as Future).then((x) {
-        whenDone();
-        return x;
-      });
-    }
-
-    whenDone();
-    return r;
-  }
-}
diff --git a/lib/src/util.dart b/lib/src/util.dart
index 9586611c..435ad4e9 100644
--- a/lib/src/util.dart
+++ b/lib/src/util.dart
@@ -20,7 +20,7 @@ getAnnotation(obj, Type T) {
     MethodMirror methodMirror = (reflect(obj) as ClosureMirror).function;
     return matchingAnnotation(methodMirror.metadata, T);
   } else {
-    ClassMirror classMirror = reflectClass(obj.runtimeType);
+    ClassMirror classMirror = reflectClass(obj.runtimeType as Type);
     return matchingAnnotation(classMirror.metadata, T);
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 37e15872..4ee94a3e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.4+4
+version: 1.1.4+5
 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
diff --git a/test/accepts_test.dart b/test/accepts_test.dart
index 0c93b6a9..2fe4e6bc 100644
--- a/test/accepts_test.dart
+++ b/test/accepts_test.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
@@ -10,34 +9,36 @@ main() {
   test('no content type', () async {
     var req = await acceptContentTypes();
     expect(req.acceptsAll, isFalse);
-    expect(req.accepts(ContentType.JSON), isFalse);
+    //expect(req.accepts(ContentType.JSON), isFalse);
     expect(req.accepts('application/json'), isFalse);
-    expect(req.accepts(ContentType.HTML), isFalse);
+    //expect(req.accepts(ContentType.HTML), isFalse);
     expect(req.accepts('text/html'), isFalse);
   });
 
   test('wildcard', () async {
     var req = await acceptContentTypes(['*/*']);
     expect(req.acceptsAll, isTrue);
-    expect(req.accepts(ContentType.JSON), isTrue);
+    //expect(req.accepts(ContentType.JSON), isTrue);
     expect(req.accepts('application/json'), isTrue);
-    expect(req.accepts(ContentType.HTML), isTrue);
+    //expect(req.accepts(ContentType.HTML), isTrue);
     expect(req.accepts('text/html'), isTrue);
   });
 
   test('specific type', () async {
     var req = await acceptContentTypes(['text/html']);
     expect(req.acceptsAll, isFalse);
-    expect(req.accepts(ContentType.JSON), isFalse);
+    //expect(req.accepts(ContentType.JSON), isFalse);
     expect(req.accepts('application/json'), isFalse);
-    expect(req.accepts(ContentType.HTML), isTrue);
+    //expect(req.accepts(ContentType.HTML), isTrue);
     expect(req.accepts('text/html'), isTrue);
   });
 
   test('strict', () async {
     var req = await acceptContentTypes(['text/html', "*/*"]);
-    expect(req.accepts(ContentType.HTML), isTrue);
-    expect(req.accepts(ContentType.JSON, strict: true), isFalse);
+    expect(req.accepts('text/html'), isTrue);
+    //expect(req.accepts(ContentType.HTML), isTrue);
+    //expect(req.accepts(ContentType.JSON, strict: true), isFalse);
+    expect(req.accepts('application/json', strict: true), isFalse);
   });
 
   group('disallow null', () {
@@ -57,7 +58,7 @@ Future<RequestContext> acceptContentTypes(
     [Iterable<String> contentTypes = const []]) {
   var headerString = contentTypes.isEmpty ? null : contentTypes.join(',');
   var rq = new MockHttpRequest('GET', ENDPOINT);
-  rq.headers.set(HttpHeaders.ACCEPT, headerString);
+  rq.headers.set('accept', headerString);
   rq.close();
   var app = new Angel();
   var http = new AngelHttp(app);
diff --git a/test/controller_test.dart b/test/controller_test.dart
index a4307b2e..47289020 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -100,7 +100,7 @@ main() {
   test('optional name', () async {
     var app = new Angel();
     await app.configure(new NamedController().configureServer);
-    expect(app.controllers['foo'], new isInstanceOf<NamedController>());
+    expect(app.controllers['foo'], const TypeMatcher<NamedController>());
   });
 
   test("middleware", () async {
diff --git a/test/di_test.dart b/test/di_test.dart
index 56b2a966..db9db0c9 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -61,7 +61,7 @@ main() {
 }
 
 void validateTodoSingleton(response) {
-  Map todo = json.decode(response.body);
+  Map todo = json.decode(response.body.toString());
   expect(todo["id"], equals(null));
   expect(todo["text"], equals(TEXT));
   expect(todo["over"], equals(OVER));
diff --git a/test/exception_test.dart b/test/exception_test.dart
index 0a852a9a..28937a1e 100644
--- a/test/exception_test.dart
+++ b/test/exception_test.dart
@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:matcher/matcher.dart';
@@ -7,29 +6,29 @@ import 'package:test/test.dart';
 main() {
   test('named constructors', () {
     expect(new AngelHttpException.badRequest(),
-        isException(HttpStatus.BAD_REQUEST, '400 Bad Request'));
+        isException(400, '400 Bad Request'));
     expect(new AngelHttpException.notAuthenticated(),
-        isException(HttpStatus.UNAUTHORIZED, '401 Not Authenticated'));
+        isException(401, '401 Not Authenticated'));
     expect(new AngelHttpException.paymentRequired(),
-        isException(HttpStatus.PAYMENT_REQUIRED, '402 Payment Required'));
+        isException(402, '402 Payment Required'));
     expect(new AngelHttpException.forbidden(),
-        isException(HttpStatus.FORBIDDEN, '403 Forbidden'));
+        isException(403, '403 Forbidden'));
     expect(new AngelHttpException.notFound(),
-        isException(HttpStatus.NOT_FOUND, '404 Not Found'));
+        isException(404, '404 Not Found'));
     expect(new AngelHttpException.methodNotAllowed(),
-        isException(HttpStatus.METHOD_NOT_ALLOWED, '405 Method Not Allowed'));
+        isException(405, '405 Method Not Allowed'));
     expect(new AngelHttpException.notAcceptable(),
-        isException(HttpStatus.NOT_ACCEPTABLE, '406 Not Acceptable'));
+        isException(406, '406 Not Acceptable'));
     expect(new AngelHttpException.methodTimeout(),
-        isException(HttpStatus.REQUEST_TIMEOUT, '408 Timeout'));
+        isException(408, '408 Timeout'));
     expect(new AngelHttpException.conflict(),
-        isException(HttpStatus.CONFLICT, '409 Conflict'));
+        isException(409, '409 Conflict'));
     expect(new AngelHttpException.notProcessable(),
         isException(422, '422 Not Processable'));
     expect(new AngelHttpException.notImplemented(),
-        isException(HttpStatus.NOT_IMPLEMENTED, '501 Not Implemented'));
+        isException(501, '501 Not Implemented'));
     expect(new AngelHttpException.unavailable(),
-        isException(HttpStatus.SERVICE_UNAVAILABLE, '503 Unavailable'));
+        isException(503, '503 Unavailable'));
   });
 
   test('fromMap', () {
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index afe51caa..0b6b0dc8 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -22,7 +22,7 @@ main() {
     client = new http.Client();
     app.use('/todos', new TypedService<Todo>(new MapService()));
     app.use('/books', new BookService());
-    Todos = app.service("todos");
+    Todos = app.service("todos") as HookedService;
 
     Todos.beforeAllStream().listen((e) {
       print('Fired ${e.eventName}! Data: ${e.data}; Params: ${e.params}');
@@ -71,7 +71,7 @@ main() {
       });
 
     var response = await client.post("$url/todos",
-        body: god.serialize({"arbitrary": "data"}), headers: headers);
+        body: god.serialize({"arbitrary": "data"}), headers: headers.cast<String, String>());
     print(response.body);
     Map result = god.deserialize(response.body);
     expect(result["hello"], equals("hooked world"));
@@ -97,7 +97,7 @@ main() {
 
   test('metadata', () async {
     final service = new HookedService(new IncrementService())..addHooks();
-    expect(service.inner, isNot(new isInstanceOf<MapService>()));
+    expect(service.inner, isNot(const TypeMatcher<MapService>()));
     IncrementService.TIMES = 0;
     await service.index();
     expect(IncrementService.TIMES, equals(2));
@@ -128,7 +128,7 @@ main() {
       print('Params to $type ${e.eventName}: ${e.params}');
       expect(e.params, isMap);
       expect(e.params.keys, contains('provider'));
-      expect(e.params['provider'], const isInstanceOf<Providers>());
+      expect(e.params['provider'], const TypeMatcher<Providers>());
     }
 
     svc
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index 20af59cb..99060a62 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'package:dart2_constant/convert.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'package:logging/logging.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
index ec0fada9..289eb533 100644
--- a/test/primitives_test.dart
+++ b/test/primitives_test.dart
@@ -18,7 +18,7 @@ main() {
         '/num/parsed/:num',
         waterfall([
           (RequestContext req) {
-            req.params['n'] = num.parse(req.params['num']);
+            req.params['n'] = num.parse(req.params['num'].toString());
             return true;
           },
           (num n) => n,
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 4e95e7d0..3dcc0c8a 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -118,7 +118,7 @@ main() {
     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_, const TypeMatcher<Map>());
     expect(json_['first'], equals('HELLO'));
     expect(json_['last'], equals('WORLD'));
   });
@@ -157,7 +157,7 @@ main() {
     Map headers = {'Content-Type': 'application/json'};
     String postData = json.encode({'it': 'works'});
     var response =
-        await client.post("$url/lambda", headers: headers, body: postData);
+        await client.post("$url/lambda", headers: headers.cast<String, String>(), body: postData);
     print('Response: ${response.body}');
     expect(json.decode(response.body)['it'], equals('works'));
   });
diff --git a/test/serialize_test.dart b/test/serialize_test.dart
index ad31a54b..24929afb 100644
--- a/test/serialize_test.dart
+++ b/test/serialize_test.dart
@@ -15,7 +15,7 @@ main() {
       ..get(
           '/bar',
           (req, ResponseContext res) =>
-              res.serialize({'hello': 'world'}, contentType: ContentType.HTML));
+              res.serialize({'hello': 'world'}, contentType: 'text/html'));
     client = new http.Client();
 
     server = await new AngelHttp(app).startServer();
@@ -33,12 +33,10 @@ main() {
   test("correct content-type", () async {
     var response = await client.get('$url/foo');
     print('Response: ${response.body}');
-    expect(response.headers[HttpHeaders.CONTENT_TYPE],
-        contains(ContentType.JSON.mimeType));
+    expect(response.headers['content-type'], contains('application/json'));
 
     response = await client.get('$url/bar');
     print('Response: ${response.body}');
-    expect(response.headers[HttpHeaders.CONTENT_TYPE],
-        contains(ContentType.HTML.mimeType));
+    expect(response.headers['content-type'], contains('text/html'));
   });
 }
diff --git a/test/server_test.dart b/test/server_test.dart
index 558ffbaa..15b42bdf 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -47,8 +47,8 @@ main() {
     await app.errorHandler(e, req, res);
     await http.sendResponse(rq, req, res);
     expect(
-      ContentType.parse(rs.headers.value(HttpHeaders.CONTENT_TYPE)).mimeType,
-      ContentType.HTML.mimeType,
+      ContentType.parse(rs.headers.value('content-type')).mimeType,
+      'text/html',
     );
     expect(rs.statusCode, e.statusCode);
     var body = await rs.transform(utf8.decoder).join();
@@ -169,35 +169,35 @@ main() {
 
     test('can send json', () async {
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'))
-        ..headers.set(HttpHeaders.ACCEPT, ContentType.JSON.toString());
+        ..headers.set('accept', 'application/json');
       rq.close();
       http.handleRequest(rq);
       await rq.response.toList();
-      expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
+      expect(rq.response.statusCode, 403);
       expect(
-          rq.response.headers.contentType.mimeType, ContentType.JSON.mimeType);
+          rq.response.headers.contentType.mimeType, 'application/json');
     });
 
     test('can throw in finalizer', () async {
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'))
-        ..headers.set(HttpHeaders.ACCEPT, ContentType.JSON.toString());
+        ..headers.set('accept', 'application/json');
       rq.close();
       http.handleRequest(rq);
       await rq.response.toList();
-      expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
+      expect(rq.response.statusCode, 403);
       expect(
-          rq.response.headers.contentType.mimeType, ContentType.JSON.mimeType);
+          rq.response.headers.contentType.mimeType, 'application/json');
     });
 
     test('can send html', () async {
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf2'));
-      rq.headers.set(HttpHeaders.ACCEPT, ContentType.HTML.toString());
+      rq.headers.set('accept', 'text/html');
       rq.close();
       http.handleRequest(rq);
       await rq.response.toList();
-      expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
+      expect(rq.response.statusCode, 403);
       expect(
-          rq.response.headers.contentType?.mimeType, ContentType.HTML.mimeType);
+          rq.response.headers.contentType?.mimeType, 'text/html');
     });
   });
 }
diff --git a/test/services_test.dart b/test/services_test.dart
index 7ea687fe..06ae7e5e 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -52,7 +52,7 @@ main() {
     test('can create data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
       var response =
-          await client.post("$url/todos", headers: headers, body: postData);
+          await client.post("$url/todos", headers: headers.cast<String, String>(), body: postData);
       expect(response.statusCode, 201);
       var json = god.deserialize(response.body);
       print(json);
@@ -61,7 +61,7 @@ main() {
 
     test('can fetch data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
-      await client.post("$url/todos", headers: headers, body: postData);
+      await client.post("$url/todos", headers: headers.cast<String, String>(), body: postData);
       var response = await client.get("$url/todos/0");
       expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
@@ -71,10 +71,10 @@ main() {
 
     test('can modify data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
-      await client.post("$url/todos", headers: headers, body: postData);
+      await client.post("$url/todos", headers: headers.cast<String, String>(), body: postData);
       postData = god.serialize({'text': 'modified'});
       var response =
-          await client.patch("$url/todos/0", headers: headers, body: postData);
+          await client.patch("$url/todos/0", headers: headers.cast<String, String>(), body: postData);
       expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
       print(json);
@@ -83,10 +83,10 @@ main() {
 
     test('can overwrite data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
-      await client.post("$url/todos", headers: headers, body: postData);
+      await client.post("$url/todos", headers: headers.cast<String, String>(), body: postData);
       postData = god.serialize({'over': 'write'});
       var response =
-          await client.post("$url/todos/0", headers: headers, body: postData);
+          await client.post("$url/todos/0", headers: headers.cast<String, String>(), body: postData);
       expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
       print(json);
@@ -97,7 +97,7 @@ main() {
     test('can delete data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
       var created = await client
-          .post("$url/todos", headers: headers, body: postData)
+          .post("$url/todos", headers: headers.cast<String, String>(), body: postData)
           .then((r) => json.decode(r.body));
       var response = await client.delete("$url/todos/${created['id']}");
       expect(response.statusCode, 200);
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index 798442ab..f6b86091 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -29,7 +29,7 @@ main() {
       },
     );
 
-    app.get('/hello', (res) {
+    app.get('/hello', (ResponseContext res) {
       new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits]).pipe(res);
     });
 
@@ -48,7 +48,7 @@ main() {
       await res.close();
     });
 
-    app.get('/overwrite', (res) async {
+    app.get('/overwrite', (ResponseContext res) async {
       res.statusCode = 32;
       await new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
           .pipe(res);
diff --git a/test/typed_service_test.dart b/test/typed_service_test.dart
index f084de04..4b4b1b28 100644
--- a/test/typed_service_test.dart
+++ b/test/typed_service_test.dart
@@ -24,7 +24,7 @@ main() {
         new Todo(text: 'a', completed: false, createdAt: now, updatedAt: now);
     var m = svc.serialize(t);
     print(m);
-    expect(m, {
+    expect(m..remove('_identityHashCode'), {
       'id': null,
       'createdAt': now.toIso8601String(),
       'updatedAt': now.toIso8601String(),
@@ -39,7 +39,7 @@ main() {
       'createdAt': now.toIso8601String(),
       'updatedAt': now.toIso8601String()
     });
-    expect(m, new isInstanceOf<Todo>());
+    expect(m, const TypeMatcher<Todo>());
     var t = m as Todo;
     expect(t.createdAt.millisecondsSinceEpoch, now.millisecondsSinceEpoch);
   });
@@ -50,7 +50,7 @@ main() {
       'created_at': now.toIso8601String(),
       'updated_at': now.toIso8601String()
     });
-    expect(m, new isInstanceOf<Todo>());
+    expect(m, const TypeMatcher<Todo>());
     var t = m as Todo;
     expect(t.createdAt.millisecondsSinceEpoch, now.millisecondsSinceEpoch);
   });