diff --git a/package-lock.json b/package-lock.json
index 0aca298..4539e47 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@fabrix/spool-tapestries",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -114,9 +114,9 @@
       }
     },
     "@fabrix/fabrix": {
-      "version": "1.5.9",
-      "resolved": "https://registry.npmjs.org/@fabrix/fabrix/-/fabrix-1.5.9.tgz",
-      "integrity": "sha512-28g+rUUngvsNctrUd2e0bIOrZ2Mx5HIfUy3/3P6BYjdaE/YqhpsnBiSWYmnfv/rN6LAJSjronioaklwP54h+jw==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@fabrix/fabrix/-/fabrix-1.6.0.tgz",
+      "integrity": "sha512-UQKtxCDR/X/fPbJwByZRsz1Jw13d9jtomuFu6YzeB5fH1Fl4k1h1vqs5utPPmi8QLWu3NYf/zIL+SODvr+Y5ZA==",
       "dev": true,
       "requires": {
         "lodash": "4.17.11",
@@ -138,12 +138,12 @@
       "dev": true
     },
     "@fabrix/spool-router": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/@fabrix/spool-router/-/spool-router-1.5.1.tgz",
-      "integrity": "sha512-ihR3fjuJGo+jJTbz7xEuFQ96DviI8kOmqaVMYLjS6MJpjIMDbHMNneff6OrHixWy0sx7T5gpuudj7X5FLhrKBg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@fabrix/spool-router/-/spool-router-1.6.0.tgz",
+      "integrity": "sha512-Qb1SZnrqY4hpXuYrFddXPqzSpzwsQmF8n8LE2ixXvo9GzUfurZXP4fovLaOBUYwVqbNyb+KYwx6FbFdxHlHtEA==",
       "dev": true,
       "requires": {
-        "call": "5.0.1",
+        "call": "5.0.3",
         "joi": "13.7.0",
         "lodash": "4.17.11"
       },
@@ -237,12 +237,12 @@
       "dev": true
     },
     "boom": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-7.2.0.tgz",
-      "integrity": "sha1-K/8kpVVldn/ehp7ICDF+sQxI6WY=",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-7.3.0.tgz",
+      "integrity": "sha512-Swpoyi2t5+GhOEGw8rEsKvTxFLIDiiKoUc2gsoV6Lyr43LHBIzch3k2MvYUs8RTROrIkVJ3Al0TkaOGjnb+B6A==",
       "dev": true,
       "requires": {
-        "hoek": "5.0.4"
+        "hoek": "6.1.2"
       }
     },
     "brace-expansion": {
@@ -268,13 +268,13 @@
       "dev": true
     },
     "call": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/call/-/call-5.0.1.tgz",
-      "integrity": "sha512-ollfFPSshiuYLp7AsrmpkQJ/PxCi6AzV81rCjBwWhyF2QGyUY/vPDMzoh4aUcWyucheRglG2LaS5qkIEfLRh6A==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/call/-/call-5.0.3.tgz",
+      "integrity": "sha512-eX16KHiAYXugbFu6VifstSdwH6aMuWWb4s0qvpq1nR1b+Sf+u68jjttg8ixDBEldPqBi30bDU35OJQWKeTLKxg==",
       "dev": true,
       "requires": {
-        "boom": "7.2.0",
-        "hoek": "5.0.4"
+        "boom": "7.3.0",
+        "hoek": "6.1.2"
       }
     },
     "chalk": {
@@ -402,9 +402,9 @@
       "dev": true
     },
     "hoek": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-5.0.4.tgz",
-      "integrity": "sha512-Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz",
+      "integrity": "sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q==",
       "dev": true
     },
     "inflight": {
@@ -433,9 +433,9 @@
       }
     },
     "isemail": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.1.3.tgz",
-      "integrity": "sha512-5xbsG5wYADIcB+mfLsd+nst1V/D+I7EU7LEZPo2GOIMu4JzfcRs5yQoypP4avA7QtUqgxYLKBYNv4IdzBmbhdw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.2.0.tgz",
+      "integrity": "sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg==",
       "dev": true,
       "requires": {
         "punycode": "2.1.1"
@@ -469,8 +469,16 @@
       "dev": true,
       "requires": {
         "hoek": "5.0.4",
-        "isemail": "3.1.3",
-        "topo": "3.0.0"
+        "isemail": "3.2.0",
+        "topo": "3.0.3"
+      },
+      "dependencies": {
+        "hoek": {
+          "version": "5.0.4",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-5.0.4.tgz",
+          "integrity": "sha512-Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w==",
+          "dev": true
+        }
       }
     },
     "js-tokens": {
@@ -2696,12 +2704,12 @@
       "dev": true
     },
     "topo": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/topo/-/topo-3.0.0.tgz",
-      "integrity": "sha512-Tlu1fGlR90iCdIPURqPiufqAlCZYzLjHYVVbcFWDMcX7+tK8hdZWAfsMrD/pBul9jqHHwFjNdf1WaxA9vTRRhw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/topo/-/topo-3.0.3.tgz",
+      "integrity": "sha512-IgpPtvD4kjrJ7CRA3ov2FhWQADwv+Tdqbsf1ZnPUSAtCJ9e1Z44MmoSGDXGk4IppoZA7jd/QRkNddlLJWlUZsQ==",
       "dev": true,
       "requires": {
-        "hoek": "5.0.4"
+        "hoek": "6.1.2"
       }
     },
     "trim-right": {
diff --git a/package.json b/package.json
index 55c61b8..9103d32 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fabrix/spool-tapestries",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "Spool - Tapestries, Easy RESTful Services",
   "scripts": {
     "build": "tsc -p ./lib/tsconfig.release.json",
@@ -50,8 +50,8 @@
     "lodash": "^4.17.10"
   },
   "devDependencies": {
-    "@fabrix/fabrix": "^1.5.9",
-    "@fabrix/spool-router": "^1.5.1",
+    "@fabrix/fabrix": "^1.6.0",
+    "@fabrix/spool-router": "^1.6.0",
     "@fabrix/lint": "^1.0.0-alpha.3",
     "@types/lodash": "^4.14.109",
     "@types/node": "~10.3.4",
diff --git a/test/fixtures/app.js b/test/fixtures/app.js
index 920bc8c..f3fe5e9 100755
--- a/test/fixtures/app.js
+++ b/test/fixtures/app.js
@@ -1,5 +1,10 @@
+'use strict'
+
 const smokesignals = require('smokesignals')
-require('@fabrix/fabrix')
+const Policy = require('@fabrix/fabrix/dist/common/Policy').FabrixPolicy
+const Controller = require('@fabrix/fabrix/dist/common/Controller').FabrixController
+const Model = require('@fabrix/fabrix/dist/common/Model').FabrixModel
+
 
 
 module.exports = {