diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 5badcd1..d505cfc 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.25
+current_version = 0.2.1
 
 [bumpversion:file:package.json]
 
diff --git a/README.md b/README.md
index e2295b0..07a0eef 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ const ocean: Ocean = await Ocean.getInstance({
     // the threshold of nodes from the secre store that have to agree to the decrypt
     threshold: 0,
     // the password for the account (in the local parity node) used to sign messages for secret store
-    password: "unittest",
+    password: "you password",
     // the address of the account (in the local parity node) used to sign messages for secret store
     address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
 })
diff --git a/package-lock.json b/package-lock.json
index 805546e..fdd54f5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@oceanprotocol/squid",
-  "version": "0.1.25",
+  "version": "0.2.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -136,9 +136,9 @@
       "dev": true
     },
     "@oceanprotocol/keeper-contracts": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/keeper-contracts/-/keeper-contracts-0.3.25.tgz",
-      "integrity": "sha512-lW/36WYYCIHSX4OVnbk6KcKnnV7vsBbrEQPW+6cWUDokEWoBfxpdMIeTxCOyKZKavv7MrtFHDrb8BgjfTIIhsA=="
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/keeper-contracts/-/keeper-contracts-0.5.0.tgz",
+      "integrity": "sha512-lQDFUhFgQkAnbKtH5nuYXr+IyUy4HC6Z90Ipc0T8OTS4VcvLqbt7F+24scb8W8K9p3suh+eTuEnfPIbcKJqE7A=="
     },
     "@oceanprotocol/secret-store-client": {
       "version": "0.0.12",
@@ -170,7 +170,7 @@
     },
     "@types/events": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
       "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==",
       "dev": true
     },
@@ -231,9 +231,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "10.12.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.10.tgz",
-      "integrity": "sha512-8xZEYckCbUVgK8Eg7lf5Iy4COKJ5uXlnIOnePN0WUwSQggy9tolM+tDJf7wMOnT/JT/W9xDYIaYggt3mRV2O5w=="
+      "version": "10.12.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.12.tgz",
+      "integrity": "sha512-Pr+6JRiKkfsFvmU/LK68oBRCQeEg36TyAbPhc2xpez24OOZZCuoIhWGTd39VZy6nGafSbxzGouFPTFD/rR1A0A=="
     },
     "@types/shelljs": {
       "version": "0.8.0",
@@ -578,7 +578,7 @@
         },
         "util": {
           "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
           "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
           "requires": {
             "inherits": "2.0.1"
@@ -1520,7 +1520,7 @@
       "dependencies": {
         "pify": {
           "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
         }
       }
@@ -1585,7 +1585,7 @@
       "dependencies": {
         "file-type": {
           "version": "3.9.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+          "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
         },
         "get-stream": {
@@ -1599,7 +1599,7 @@
         },
         "pify": {
           "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
         }
       }
@@ -1753,7 +1753,7 @@
     },
     "eccrypto": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/eccrypto/-/eccrypto-1.0.3.tgz",
+      "resolved": "http://registry.npmjs.org/eccrypto/-/eccrypto-1.0.3.tgz",
       "integrity": "sha1-pBIObOmLAHLBzqr96tFW9ruLJOM=",
       "requires": {
         "elliptic": "^6.0.2",
@@ -2350,6 +2350,11 @@
       "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
       "dev": true
     },
+    "file-saver": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.0.tgz",
+      "integrity": "sha512-cYM1ic5DAkg25pHKgi5f10ziAM7RJU37gaH1XQlyNDrtUnzhC/dfoV9zf2OmF0RMKi42jG5B0JWBnPQqyj/G6g=="
+    },
     "file-type": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
@@ -3965,7 +3970,7 @@
     },
     "media-typer": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
     "mem": {
@@ -4409,7 +4414,7 @@
       "dependencies": {
         "align-text": {
           "version": "0.1.4",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
           "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
           "dev": true,
           "requires": {
@@ -4420,19 +4425,19 @@
         },
         "amdefine": {
           "version": "1.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
           "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
           "dev": true
         },
         "ansi-regex": {
           "version": "3.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
           "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
         "append-transform": {
           "version": "1.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz",
           "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==",
           "dev": true,
           "requires": {
@@ -4441,31 +4446,31 @@
         },
         "archy": {
           "version": "1.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
           "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
           "dev": true
         },
         "arrify": {
           "version": "1.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
           "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
           "dev": true
         },
         "async": {
           "version": "1.5.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
           "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
           "dev": true
         },
         "balanced-match": {
           "version": "1.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
           "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
           "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
           "requires": {
@@ -4475,13 +4480,13 @@
         },
         "builtin-modules": {
           "version": "1.1.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
           "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
           "dev": true
         },
         "caching-transform": {
           "version": "2.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-2.0.0.tgz",
           "integrity": "sha512-tTfemGmFWe7KZ3KN6VsSgQZbd9Bgo7A40wlp4PTsJJvFu4YAnEC5YnfdiKq6Vh2i9XJLnA9n8OXD46orVpnPMw==",
           "dev": true,
           "requires": {
@@ -4493,14 +4498,14 @@
         },
         "camelcase": {
           "version": "1.2.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
           "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
           "dev": true,
           "optional": true
         },
         "center-align": {
           "version": "0.1.3",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
           "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
           "dev": true,
           "optional": true,
@@ -4511,7 +4516,7 @@
         },
         "cliui": {
           "version": "2.1.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
           "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
           "dev": true,
           "optional": true,
@@ -4523,7 +4528,7 @@
           "dependencies": {
             "wordwrap": {
               "version": "0.0.2",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
               "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
               "dev": true,
               "optional": true
@@ -4532,25 +4537,25 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
           "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
           "dev": true
         },
         "commondir": {
           "version": "1.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
           "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
           "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
           "dev": true
         },
         "convert-source-map": {
           "version": "1.6.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
           "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
           "dev": true,
           "requires": {
@@ -4559,7 +4564,7 @@
         },
         "cross-spawn": {
           "version": "4.0.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
           "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
           "dev": true,
           "requires": {
@@ -4569,7 +4574,7 @@
         },
         "debug": {
           "version": "3.1.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
           "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
@@ -4578,19 +4583,19 @@
         },
         "debug-log": {
           "version": "1.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/debug-log/-/debug-log-1.0.1.tgz",
           "integrity": "sha1-IwdjLUwEOCuN+KMvcLiVBG1SdF8=",
           "dev": true
         },
         "decamelize": {
           "version": "1.2.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
           "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
           "dev": true
         },
         "default-require-extensions": {
           "version": "2.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz",
           "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=",
           "dev": true,
           "requires": {
@@ -4599,7 +4604,7 @@
         },
         "error-ex": {
           "version": "1.3.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
           "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
           "dev": true,
           "requires": {
@@ -4608,13 +4613,13 @@
         },
         "es6-error": {
           "version": "4.1.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
           "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
           "dev": true
         },
         "execa": {
           "version": "0.7.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
           "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
           "dev": true,
           "requires": {
@@ -4629,7 +4634,7 @@
           "dependencies": {
             "cross-spawn": {
               "version": "5.1.0",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
               "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
               "dev": true,
               "requires": {
@@ -4642,7 +4647,7 @@
         },
         "find-cache-dir": {
           "version": "2.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz",
           "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==",
           "dev": true,
           "requires": {
@@ -4653,7 +4658,7 @@
         },
         "find-up": {
           "version": "3.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
@@ -4662,7 +4667,7 @@
         },
         "foreground-child": {
           "version": "1.5.6",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz",
           "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=",
           "dev": true,
           "requires": {
@@ -4672,25 +4677,25 @@
         },
         "fs.realpath": {
           "version": "1.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
           "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
           "dev": true
         },
         "get-caller-file": {
           "version": "1.0.3",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
           "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
           "dev": true
         },
         "get-stream": {
           "version": "3.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
           "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
           "dev": true
         },
         "glob": {
           "version": "7.1.3",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
           "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
           "dev": true,
           "requires": {
@@ -4704,13 +4709,13 @@
         },
         "graceful-fs": {
           "version": "4.1.11",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
           "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
           "dev": true
         },
         "handlebars": {
           "version": "4.0.11",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz",
           "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
           "dev": true,
           "requires": {
@@ -4722,7 +4727,7 @@
           "dependencies": {
             "source-map": {
               "version": "0.4.4",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
               "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
               "dev": true,
               "requires": {
@@ -4733,25 +4738,25 @@
         },
         "has-flag": {
           "version": "3.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
           "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
         "hosted-git-info": {
           "version": "2.7.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
           "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
           "dev": true
         },
         "imurmurhash": {
           "version": "0.1.4",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
           "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
           "dev": true
         },
         "inflight": {
           "version": "1.0.6",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
           "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
           "dev": true,
           "requires": {
@@ -4761,31 +4766,31 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "dev": true
         },
         "invert-kv": {
           "version": "1.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
           "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
           "dev": true
         },
         "is-arrayish": {
           "version": "0.2.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
           "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
           "dev": true
         },
         "is-buffer": {
           "version": "1.1.6",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
           "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
           "dev": true
         },
         "is-builtin-module": {
           "version": "1.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
           "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
           "dev": true,
           "requires": {
@@ -4794,31 +4799,31 @@
         },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
         "is-stream": {
           "version": "1.1.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
           "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
           "dev": true
         },
         "isexe": {
           "version": "2.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
           "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
           "dev": true
         },
         "istanbul-lib-coverage": {
           "version": "2.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
           "integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==",
           "dev": true
         },
         "istanbul-lib-hook": {
           "version": "2.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.1.tgz",
           "integrity": "sha512-ufiZoiJ8CxY577JJWEeFuxXZoMqiKpq/RqZtOAYuQLvlkbJWscq9n3gc4xrCGH9n4pW0qnTxOz1oyMmVtk8E1w==",
           "dev": true,
           "requires": {
@@ -4827,7 +4832,7 @@
         },
         "istanbul-lib-report": {
           "version": "2.0.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.2.tgz",
           "integrity": "sha512-rJ8uR3peeIrwAxoDEbK4dJ7cqqtxBisZKCuwkMtMv0xYzaAnsAi3AHrHPAAtNXzG/bcCgZZ3OJVqm1DTi9ap2Q==",
           "dev": true,
           "requires": {
@@ -4838,7 +4843,7 @@
         },
         "istanbul-lib-source-maps": {
           "version": "2.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-2.0.1.tgz",
           "integrity": "sha512-30l40ySg+gvBLcxTrLzR4Z2XTRj3HgRCA/p2rnbs/3OiTaoj054gAbuP5DcLOtwqmy4XW8qXBHzrmP2/bQ9i3A==",
           "dev": true,
           "requires": {
@@ -4851,7 +4856,7 @@
           "dependencies": {
             "source-map": {
               "version": "0.6.1",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
               "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
               "dev": true
             }
@@ -4859,7 +4864,7 @@
         },
         "istanbul-reports": {
           "version": "2.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.0.1.tgz",
           "integrity": "sha512-CT0QgMBJqs6NJLF678ZHcquUAZIoBIUNzdJrRJfpkI9OnzG6MkUfHxbJC3ln981dMswC7/B1mfX3LNkhgJxsuw==",
           "dev": true,
           "requires": {
@@ -4868,13 +4873,13 @@
         },
         "json-parse-better-errors": {
           "version": "1.0.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
           "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
           "dev": true
         },
         "kind-of": {
           "version": "3.2.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
@@ -4883,14 +4888,14 @@
         },
         "lazy-cache": {
           "version": "1.0.4",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
           "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
           "dev": true,
           "optional": true
         },
         "lcid": {
           "version": "1.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
           "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
           "dev": true,
           "requires": {
@@ -4899,7 +4904,7 @@
         },
         "load-json-file": {
           "version": "4.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
@@ -4911,7 +4916,7 @@
         },
         "locate-path": {
           "version": "3.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
           "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "dev": true,
           "requires": {
@@ -4921,19 +4926,19 @@
         },
         "lodash.flattendeep": {
           "version": "4.4.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
           "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
           "dev": true
         },
         "longest": {
           "version": "1.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
           "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
           "dev": true
         },
         "lru-cache": {
           "version": "4.1.3",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
           "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
           "dev": true,
           "requires": {
@@ -4943,7 +4948,7 @@
         },
         "make-dir": {
           "version": "1.3.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
           "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
           "dev": true,
           "requires": {
@@ -4952,7 +4957,7 @@
         },
         "md5-hex": {
           "version": "2.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-2.0.0.tgz",
           "integrity": "sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=",
           "dev": true,
           "requires": {
@@ -4961,13 +4966,13 @@
         },
         "md5-o-matic": {
           "version": "0.1.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz",
           "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=",
           "dev": true
         },
         "mem": {
           "version": "1.1.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
           "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
           "dev": true,
           "requires": {
@@ -4976,7 +4981,7 @@
         },
         "merge-source-map": {
           "version": "1.1.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
           "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
           "dev": true,
           "requires": {
@@ -4985,7 +4990,7 @@
           "dependencies": {
             "source-map": {
               "version": "0.6.1",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
               "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
               "dev": true
             }
@@ -4993,13 +4998,13 @@
         },
         "mimic-fn": {
           "version": "1.2.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
           "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
           "dev": true
         },
         "minimatch": {
           "version": "3.0.4",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
           "requires": {
@@ -5008,13 +5013,13 @@
         },
         "minimist": {
           "version": "0.0.10",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
           "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
           "dev": true
         },
         "mkdirp": {
           "version": "0.5.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
           "requires": {
@@ -5023,7 +5028,7 @@
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
               "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
               "dev": true
             }
@@ -5031,13 +5036,13 @@
         },
         "ms": {
           "version": "2.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         },
         "normalize-package-data": {
           "version": "2.4.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
           "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
           "dev": true,
           "requires": {
@@ -5049,7 +5054,7 @@
         },
         "npm-run-path": {
           "version": "2.0.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
           "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
           "dev": true,
           "requires": {
@@ -5058,13 +5063,13 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
           "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
           "dev": true
         },
         "once": {
           "version": "1.4.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
           "requires": {
@@ -5073,7 +5078,7 @@
         },
         "optimist": {
           "version": "0.6.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
           "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
           "dev": true,
           "requires": {
@@ -5083,13 +5088,13 @@
         },
         "os-homedir": {
           "version": "1.0.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
           "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
           "dev": true
         },
         "os-locale": {
           "version": "2.1.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
           "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
           "dev": true,
           "requires": {
@@ -5100,13 +5105,13 @@
         },
         "p-finally": {
           "version": "1.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
           "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
           "dev": true
         },
         "p-limit": {
           "version": "2.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz",
           "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
           "dev": true,
           "requires": {
@@ -5115,7 +5120,7 @@
         },
         "p-locate": {
           "version": "3.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
@@ -5124,13 +5129,13 @@
         },
         "p-try": {
           "version": "2.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
           "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
           "dev": true
         },
         "package-hash": {
           "version": "2.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-2.0.0.tgz",
           "integrity": "sha1-eK4ybIngWk2BO2hgGXevBcANKg0=",
           "dev": true,
           "requires": {
@@ -5142,7 +5147,7 @@
         },
         "parse-json": {
           "version": "4.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
@@ -5152,25 +5157,25 @@
         },
         "path-exists": {
           "version": "3.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
           "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
           "dev": true
         },
         "path-is-absolute": {
           "version": "1.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
           "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
           "dev": true
         },
         "path-key": {
           "version": "2.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
           "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
           "dev": true
         },
         "path-type": {
           "version": "3.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
           "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
           "dev": true,
           "requires": {
@@ -5179,13 +5184,13 @@
         },
         "pify": {
           "version": "3.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
           "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
           "dev": true
         },
         "pkg-dir": {
           "version": "3.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
           "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
           "dev": true,
           "requires": {
@@ -5194,13 +5199,13 @@
         },
         "pseudomap": {
           "version": "1.0.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
           "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
           "dev": true
         },
         "read-pkg": {
           "version": "3.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
@@ -5211,7 +5216,7 @@
         },
         "read-pkg-up": {
           "version": "4.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
           "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
           "dev": true,
           "requires": {
@@ -5221,7 +5226,7 @@
         },
         "release-zalgo": {
           "version": "1.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
           "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=",
           "dev": true,
           "requires": {
@@ -5230,31 +5235,31 @@
         },
         "repeat-string": {
           "version": "1.6.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
           "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
           "dev": true
         },
         "require-directory": {
           "version": "2.1.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
           "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
           "dev": true
         },
         "require-main-filename": {
           "version": "1.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
           "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
           "dev": true
         },
         "resolve-from": {
           "version": "4.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
           "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
           "dev": true
         },
         "right-align": {
           "version": "0.1.3",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
           "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
           "dev": true,
           "optional": true,
@@ -5264,7 +5269,7 @@
         },
         "rimraf": {
           "version": "2.6.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
           "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
           "dev": true,
           "requires": {
@@ -5273,25 +5278,25 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
           "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
           "dev": true
         },
         "semver": {
           "version": "5.5.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
           "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
           "dev": true
         },
         "set-blocking": {
           "version": "2.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
           "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
           "dev": true
         },
         "shebang-command": {
           "version": "1.2.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
           "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
           "dev": true,
           "requires": {
@@ -5300,26 +5305,26 @@
         },
         "shebang-regex": {
           "version": "1.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
           "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
           "dev": true
         },
         "signal-exit": {
           "version": "3.0.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
           "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
           "dev": true
         },
         "source-map": {
           "version": "0.5.7",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true,
           "optional": true
         },
         "spawn-wrap": {
           "version": "1.4.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.2.tgz",
           "integrity": "sha512-vMwR3OmmDhnxCVxM8M+xO/FtIp6Ju/mNaDfCMMW7FDcLRTPFWUswec4LXJHTJE2hwTI9O0YBfygu4DalFl7Ylg==",
           "dev": true,
           "requires": {
@@ -5333,7 +5338,7 @@
         },
         "spdx-correct": {
           "version": "3.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
           "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
           "dev": true,
           "requires": {
@@ -5343,13 +5348,13 @@
         },
         "spdx-exceptions": {
           "version": "2.1.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
           "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==",
           "dev": true
         },
         "spdx-expression-parse": {
           "version": "3.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
           "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
           "dev": true,
           "requires": {
@@ -5359,13 +5364,13 @@
         },
         "spdx-license-ids": {
           "version": "3.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz",
           "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==",
           "dev": true
         },
         "string-width": {
           "version": "2.1.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
@@ -5375,7 +5380,7 @@
         },
         "strip-ansi": {
           "version": "4.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
@@ -5384,19 +5389,19 @@
         },
         "strip-bom": {
           "version": "3.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
           "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
           "dev": true
         },
         "strip-eof": {
           "version": "1.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
           "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
           "dev": true
         },
         "supports-color": {
           "version": "5.4.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
@@ -5405,7 +5410,7 @@
         },
         "test-exclude": {
           "version": "5.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.0.0.tgz",
           "integrity": "sha512-bO3Lj5+qFa9YLfYW2ZcXMOV1pmQvw+KS/DpjqhyX6Y6UZ8zstpZJ+mA2ERkXfpOqhxsJlQiLeVXD3Smsrs6oLw==",
           "dev": true,
           "requires": {
@@ -5417,7 +5422,7 @@
         },
         "uglify-js": {
           "version": "2.8.29",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
           "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
           "dev": true,
           "optional": true,
@@ -5429,7 +5434,7 @@
           "dependencies": {
             "yargs": {
               "version": "3.10.0",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
               "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
               "dev": true,
               "optional": true,
@@ -5444,20 +5449,20 @@
         },
         "uglify-to-browserify": {
           "version": "1.0.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
           "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
           "dev": true,
           "optional": true
         },
         "uuid": {
           "version": "3.3.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
           "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
           "dev": true
         },
         "validate-npm-package-license": {
           "version": "3.0.3",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz",
           "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==",
           "dev": true,
           "requires": {
@@ -5467,7 +5472,7 @@
         },
         "which": {
           "version": "1.3.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
           "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
           "dev": true,
           "requires": {
@@ -5476,26 +5481,26 @@
         },
         "which-module": {
           "version": "2.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
           "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
           "dev": true
         },
         "window-size": {
           "version": "0.1.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
           "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
           "dev": true,
           "optional": true
         },
         "wordwrap": {
           "version": "0.0.3",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
           "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
           "dev": true
         },
         "wrap-ansi": {
           "version": "2.1.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
           "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
           "dev": true,
           "requires": {
@@ -5505,13 +5510,13 @@
           "dependencies": {
             "ansi-regex": {
               "version": "2.1.1",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
               "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
               "dev": true
             },
             "is-fullwidth-code-point": {
               "version": "1.0.0",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
               "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
               "dev": true,
               "requires": {
@@ -5520,7 +5525,7 @@
             },
             "string-width": {
               "version": "1.0.2",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
               "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
               "dev": true,
               "requires": {
@@ -5531,7 +5536,7 @@
             },
             "strip-ansi": {
               "version": "3.0.1",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
               "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
               "dev": true,
               "requires": {
@@ -5542,13 +5547,13 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
           "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
           "dev": true
         },
         "write-file-atomic": {
           "version": "2.3.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
           "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
           "dev": true,
           "requires": {
@@ -5559,19 +5564,19 @@
         },
         "y18n": {
           "version": "3.2.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
           "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
           "dev": true
         },
         "yallist": {
           "version": "2.1.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
           "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
           "dev": true
         },
         "yargs": {
           "version": "11.1.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
           "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
           "dev": true,
           "requires": {
@@ -5591,7 +5596,7 @@
           "dependencies": {
             "cliui": {
               "version": "4.1.0",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
               "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
               "dev": true,
               "requires": {
@@ -5602,7 +5607,7 @@
             },
             "find-up": {
               "version": "2.1.0",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
               "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
               "dev": true,
               "requires": {
@@ -5611,7 +5616,7 @@
             },
             "locate-path": {
               "version": "2.0.0",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
               "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
               "dev": true,
               "requires": {
@@ -5621,7 +5626,7 @@
             },
             "p-limit": {
               "version": "1.3.0",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
               "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
               "dev": true,
               "requires": {
@@ -5630,7 +5635,7 @@
             },
             "p-locate": {
               "version": "2.0.0",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
               "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
               "dev": true,
               "requires": {
@@ -5639,7 +5644,7 @@
             },
             "p-try": {
               "version": "1.0.0",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
               "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
               "dev": true
             }
@@ -5647,7 +5652,7 @@
         },
         "yargs-parser": {
           "version": "9.0.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
           "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
           "dev": true,
           "requires": {
@@ -5656,7 +5661,7 @@
           "dependencies": {
             "camelcase": {
               "version": "4.1.0",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
               "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
               "dev": true
             }
@@ -5884,7 +5889,7 @@
     },
     "path-is-absolute": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "path-key": {
@@ -6325,9 +6330,9 @@
       }
     },
     "rollup": {
-      "version": "0.67.3",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.67.3.tgz",
-      "integrity": "sha512-TyNQCz97rKuVVbsKUTXfwIjV7UljWyTVd7cTMuE+aqlQ7WJslkYF5QaYGjMLR2BlQtUOO5CAxSVnpQ55iYp5jg==",
+      "version": "0.67.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.67.4.tgz",
+      "integrity": "sha512-AVuP73mkb4BBMUmksQ3Jw0jTrBTU1i7rLiUYjFxLZGb3xiFmtVEg40oByphkZAsiL0bJC3hRAJUQos/e5EBd+w==",
       "dev": true,
       "requires": {
         "@types/estree": "0.0.39",
@@ -6349,7 +6354,7 @@
     },
     "safe-regex": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "requires": {
         "ret": "~0.1.10"
@@ -6830,7 +6835,7 @@
     },
     "stream-browserify": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
       "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
       "requires": {
         "inherits": "~2.0.1",
@@ -6903,7 +6908,7 @@
     },
     "strip-eof": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
     },
     "strip-hex-prefix": {
@@ -6989,7 +6994,7 @@
     },
     "tar": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
       "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
       "requires": {
         "block-stream": "*",
@@ -7031,9 +7036,9 @@
       }
     },
     "terser": {
-      "version": "3.10.12",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-3.10.12.tgz",
-      "integrity": "sha512-3ODPC1eVt25EVNb04s/PkHxOmzKBQUF6bwwuR6h2DbEF8/j265Y1UkwNtOk9am/pRxfJ5HPapOlUlO6c16mKQQ==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-3.11.0.tgz",
+      "integrity": "sha512-5iLMdhEPIq3zFWskpmbzmKwMQixKmTYwY3Ox9pjtSklBLnHiuQ0GKJLhL1HSYtyffHM3/lDIFBnb82m9D7ewwQ==",
       "dev": true,
       "requires": {
         "commander": "~2.17.1",
@@ -7222,24 +7227,17 @@
       "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
       "dev": true
     },
+    "truffle-hdwallet-provider": {
+      "version": "1.0.0-web3one.2",
+      "resolved": "https://registry.npmjs.org/truffle-hdwallet-provider/-/truffle-hdwallet-provider-1.0.0-web3one.2.tgz",
+      "integrity": "sha512-rFrGIsbTyeieSsYG/mxmQN+xH6eD/45H2q3bY7jnlex1ICWReh+gXSeIXl1MH9glFt2ESZ0gFJPZDzjfGpxUdg==",
+      "dev": true
+    },
     "tryer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
       "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="
     },
-    "ts-loader": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-5.3.0.tgz",
-      "integrity": "sha512-lGSNs7szRFj/rK9T1EQuayE3QNLg6izDUxt5jpmq0RG1rU2bapAt7E7uLckLCUPeO1jwxCiet2oRaWovc53UAg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.3.0",
-        "enhanced-resolve": "^4.0.0",
-        "loader-utils": "^1.0.2",
-        "micromatch": "^3.1.4",
-        "semver": "^5.0.1"
-      }
-    },
     "ts-node": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.1.tgz",
@@ -7389,6 +7387,12 @@
           "requires": {
             "graceful-fs": "^4.1.6"
           }
+        },
+        "typescript": {
+          "version": "3.1.6",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.6.tgz",
+          "integrity": "sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==",
+          "dev": true
         }
       }
     },
@@ -7399,9 +7403,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.6.tgz",
-      "integrity": "sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
+      "integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",
       "dev": true
     },
     "uglify-es": {
@@ -7766,7 +7770,7 @@
     },
     "utf8": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.1.tgz",
+      "resolved": "http://registry.npmjs.org/utf8/-/utf8-2.1.1.tgz",
       "integrity": "sha1-LgHbAvfY0JRPdxBPFgnrDDBM92g="
     },
     "util": {
@@ -8192,9 +8196,9 @@
       "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
     },
     "webpack": {
-      "version": "4.26.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.26.1.tgz",
-      "integrity": "sha512-i2oOvEvuvLLSuSCkdVrknaxAhtUZ9g+nLSoHCWV0gDzqGX2DXaCrMmMUpbRsTSSLrUqAI56PoEiyMUZIZ1msug==",
+      "version": "4.27.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.27.1.tgz",
+      "integrity": "sha512-WArHiLvHrlfyRM8i7f+2SFbr/XbQ0bXqTkPF8JpHOzub5482Y3wx7rEO8stuLGOKOgZJcqcisLhD7LrM/+fVMw==",
       "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.7.11",
diff --git a/package.json b/package.json
index 250db18..73035b1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oceanprotocol/squid",
-  "version": "0.1.26",
+  "version": "0.2.1",
   "description": "JavaScript client library for Ocean Protocol",
   "main": "./dist/node/squid.js",
   "browser": "./dist/browser/squid.cjs2.min.js",
@@ -51,12 +51,13 @@
   },
   "homepage": "https://github.com/oceanprotocol/squid-js#readme",
   "dependencies": {
-    "@oceanprotocol/keeper-contracts": "0.3.25",
+    "@oceanprotocol/keeper-contracts": "^0.5.0",
     "@oceanprotocol/secret-store-client": "0.0.12",
     "bignumber.js": "^8.0.1",
     "eth-crypto": "^1.2.7",
     "eth-ecies": "^1.0.3",
     "ethereumjs-util": "^6.0.0",
+    "file-saver": "^2.0.0",
     "jsonwebtoken": "^8.4.0",
     "node-fetch": "^2.3.0",
     "uuid": "^3.3.2",
@@ -67,20 +68,20 @@
   "devDependencies": {
     "@types/chai": "^4.1.7",
     "@types/mocha": "^5.2.5",
-    "@types/node": "^10.12.10",
+    "@types/node": "^10.12.12",
     "chai": "^4.2.0",
     "cross-env": "^5.2.0",
     "mocha": "^5.2.0",
     "nyc": "^13.1.0",
-    "rollup": "^0.67.3",
+    "rollup": "^0.67.4",
     "source-map-support": "^0.5.9",
-    "ts-loader": "^5.3.0",
+    "truffle-hdwallet-provider": "^1.0.0-web3one.2",
     "ts-node": "^7.0.1",
     "tslint": "^5.11.0",
     "typedoc": "^0.13.0",
-    "typescript": "^3.1.6",
+    "typescript": "^3.2.2",
     "uglify-js": "^3.4.9",
-    "webpack": "^4.26.1",
+    "webpack": "^4.27.1",
     "webpack-cli": "^3.1.2",
     "webpack-concat-plugin": "^3.0.0",
     "webpack-merge": "^4.1.4"
diff --git a/src/aquarius/Aquarius.ts b/src/aquarius/Aquarius.ts
index 2e6a14c..c6c24c0 100644
--- a/src/aquarius/Aquarius.ts
+++ b/src/aquarius/Aquarius.ts
@@ -137,6 +137,6 @@ export default class Aquarius {
     }
 
     public getServiceEndpoint(did) {
-        return `${this.url}/api/v1/provider/assets/metadata/${did}`
+        return `${this.url}/api/v1/aquarius/assets/metadata/${did}`
     }
 }
diff --git a/src/brizo/Brizo.ts b/src/brizo/Brizo.ts
index e01f7e5..fe7a465 100644
--- a/src/brizo/Brizo.ts
+++ b/src/brizo/Brizo.ts
@@ -1,6 +1,8 @@
 import Config from "../models/Config"
 import WebServiceConnectorProvider from "../utils/WebServiceConnectorProvider"
 
+const apiPath = "/api/v1/brizo/services"
+
 export default class Brizo {
     private url: string
 
@@ -10,16 +12,16 @@ export default class Brizo {
     }
 
     public getPurchaseEndpoint() {
-        return `${this.url}/api/v1/brizo/services/access/purchase?`
+        return `${this.url}${apiPath}/access/purchase?`
     }
 
-    public getConsumeEndpoint(pubKey: string, serviceId: string, url: string) {
-        return `${this.url}/api/v1/brizo/services/consume?pubKey=${pubKey}&serviceId=${serviceId}&url=${url}`
+    public getConsumeEndpoint() {
+        return `${this.url}${apiPath}/consume`
     }
 
     public getComputeEndpoint(pubKey: string, serviceId: string, algo: string, container: string) {
         // tslint:disable-next-line
-        return `${this.url}/api/v1/brizo/services/compute?pubKey=${pubKey}&serviceId=${serviceId}&algo=${algo}&container=${container}"`
+        return `${this.url}${apiPath}/compute?pubKey=${pubKey}&serviceId=${serviceId}&algo=${algo}&container=${container}"`
     }
 
     public async initializeServiceAgreement(
@@ -27,17 +29,22 @@ export default class Brizo {
         serviceAgreementId: string,
         serviceDefinitionId: string,
         signature: string,
-        consumerPublicKey: string): Promise<any> {
+        consumerAddress: string): Promise<any> {
 
-        return WebServiceConnectorProvider.getConnector().post(
-            `${this.url}/api/v1/brizo/services/access/initialize`,
-            {
-                did,
-                serviceAgreementId,
-                serviceDefinitionId,
-                signature,
-                consumerPublicKey,
-            })
+        const args = {
+            did,
+            serviceAgreementId,
+            serviceDefinitionId,
+            signature,
+            consumerAddress,
+        }
+
+        return WebServiceConnectorProvider
+            .getConnector()
+            .post(
+                `${this.url}${apiPath}/access/initialize`,
+                decodeURI(JSON.stringify(args)),
+            )
 
     }
 }
diff --git a/src/ddo/Condition.ts b/src/ddo/Condition.ts
index 80609d2..ff88d89 100644
--- a/src/ddo/Condition.ts
+++ b/src/ddo/Condition.ts
@@ -1,14 +1,15 @@
+import Dependency from "./Dependency"
 import Event from "./Event"
 import Parameter from "./Parameter"
 
 export default class Condition {
+    public name: string
     public contractName: string = "AccessCondition"
-    public methodName: string = "lockPayment"
+    public functionName: string = "lockPayment"
     public timeout: number = 0
     public conditionKey: string = "0x12122434"
     public parameters: Parameter[]
     public events: Event[]
-    public dependencies: string[] = []
-    public dependencyTimeoutFlags: number[] = []
+    public dependencies: Dependency[] = []
     public isTerminalCondition: boolean = false
 }
diff --git a/src/ddo/Contract.ts b/src/ddo/Contract.ts
new file mode 100644
index 0000000..0396a1a
--- /dev/null
+++ b/src/ddo/Contract.ts
@@ -0,0 +1,7 @@
+import Event from "./Event"
+
+export default class Contract {
+    public contractName: string
+    public fulfillmentOperator: number
+    public events: Event[]
+}
diff --git a/src/ddo/DDO.ts b/src/ddo/DDO.ts
index 2158d37..49b447f 100644
--- a/src/ddo/DDO.ts
+++ b/src/ddo/DDO.ts
@@ -22,7 +22,7 @@ export default class DDO {
 
     public constructor(ddo?: {
         id?: string,
-        publicKey?: any[],
+        publicKey?: PublicKey[],
         authentication?: Authentication[],
         service?: Service[],
     }) {
diff --git a/src/ddo/Dependency.ts b/src/ddo/Dependency.ts
new file mode 100644
index 0000000..2a824f6
--- /dev/null
+++ b/src/ddo/Dependency.ts
@@ -0,0 +1,4 @@
+export default class Dependency {
+    public name: string = "lockPayment"
+    public timeout: number = 0
+}
diff --git a/src/ddo/Event.ts b/src/ddo/Event.ts
index 2ca59ba..2195acf 100644
--- a/src/ddo/Event.ts
+++ b/src/ddo/Event.ts
@@ -1,7 +1,7 @@
-import EventHandlers from "./EventHandlers"
+import EventHandler from "./EventHandler"
 
 export default class Event {
     public name: string
-    public actorType: string[]
-    public handlers: EventHandlers
+    public actorType: string
+    public handler: EventHandler
 }
diff --git a/src/ddo/EventHandlers.ts b/src/ddo/EventHandler.ts
similarity index 79%
rename from src/ddo/EventHandlers.ts
rename to src/ddo/EventHandler.ts
index 9f7e4b0..5819cda 100644
--- a/src/ddo/EventHandlers.ts
+++ b/src/ddo/EventHandler.ts
@@ -1,4 +1,4 @@
-export default class EventHandlers {
+export default class EventHandler {
     public moduleName: string = "serviceAgreement"
     public functionName: string = "fulfillAgreement"
     public version: string = "0.1"
diff --git a/src/ddo/PublicKey.ts b/src/ddo/PublicKey.ts
index 4de771c..81bf2f6 100644
--- a/src/ddo/PublicKey.ts
+++ b/src/ddo/PublicKey.ts
@@ -1,6 +1,6 @@
 export default class PublicKey {
     public id: string = "did:op:123456789abcdefghi#keys-1"
-    public type: string = "RsaVerificationKey2018"
+    public type: string = "Ed25519VerificationKey2018"
     public owner: string = "did:op:123456789abcdefghi"
     public publicKeyPem?: string = "-----BEGIN PUBLIC KEY...END PUBLIC KEY-----\r\n"
     public publicKeyBase58?: string = "H3C2AVvLMv6gmMNam3uVAjZpfkcJCwDwnZn6z3wXmqPV"
diff --git a/src/ddo/Service.ts b/src/ddo/Service.ts
index 7e910b5..4891d39 100644
--- a/src/ddo/Service.ts
+++ b/src/ddo/Service.ts
@@ -1,4 +1,5 @@
 import Condition from "./Condition"
+import Contract from "./Contract"
 import MetaData from "./MetaData"
 
 export default class Service {
@@ -9,5 +10,6 @@ export default class Service {
     public purchaseEndpoint?: string
     public description?: string = "My public social inbox"
     public metadata?: MetaData = {} as MetaData
+    public serviceAgreementContract?: Contract
     public conditions?: Condition[] = []
 }
diff --git a/src/examples/BuyAsset.ts b/src/examples/BuyAsset.ts
new file mode 100644
index 0000000..53b1376
--- /dev/null
+++ b/src/examples/BuyAsset.ts
@@ -0,0 +1,70 @@
+import DDO from "../ddo/DDO"
+import MetaData from "../ddo/MetaData"
+import MetaDataBase from "../ddo/MetaDataBase"
+import Service from "../ddo/Service"
+import {Account, Logger, Ocean, ServiceAgreement} from "../squid"
+import config from "./config"
+
+(async () => {
+    const ocean: Ocean = await Ocean.getInstance(config)
+
+    const publisher: Account = (await ocean.getAccounts())[0]
+    const consumer: Account = (await ocean.getAccounts())[1]
+
+    const metaData = new MetaData({
+        base: {
+            name: "Office Humidity",
+            type: "dataset",
+            description: "Weather information of UK including temperature and humidity",
+            size: "3.1gb",
+            dateCreated: "2012-02-01T10:55:11+00:00",
+            author: "Met Office",
+            license: "CC-BY",
+            copyrightHolder: "Met Office",
+            encoding: "UTF-8",
+            compression: "zip",
+            contentType: "text/csv",
+            // tslint:disable-next-line
+            workExample: "stationId,latitude,longitude,datetime,temperature,humidity423432fsd,51.509865,-0.118092,2011-01-01T10:55:11+00:00,7.2,68",
+            contentUrls: [
+                "https://testocnfiles.blob.core.windows.net/testfiles/testzkp.zip",
+                "https://testocnfiles.blob.core.windows.net/testfiles/testzkp.zip",
+            ],
+            links: [
+                {sample1: "http://data.ceda.ac.uk/badc/ukcp09/data/gridded-land-obs/gridded-land-obs-daily/"},
+                {sample2: "http://data.ceda.ac.uk/badc/ukcp09/data/gridded-land-obs/gridded-land-obs-averages-25km/"},
+                {fieldsDescription: "http://data.ceda.ac.uk/badc/ukcp09/"},
+            ],
+            inLanguage: "en",
+            tags: "weather, uk, 2011, temperature, humidity",
+            price: 10,
+        } as MetaDataBase,
+    } as MetaData)
+
+    const ddo: DDO = await ocean.registerAsset(metaData, publisher)
+    Logger.log("did", ddo.id)
+    const assetId = ddo.id.replace("did:op:", "")
+
+    const accessService = ddo.findServiceByType("Access")
+
+    await consumer.requestTokens(metaData.base.price)
+
+    const serviceAgreementSignatureResult: any = await ocean.signServiceAgreement(ddo.id,
+        accessService.serviceDefinitionId, consumer)
+    Logger.log("ServiceAgreement Id:", serviceAgreementSignatureResult.serviceAgreementId)
+    Logger.log("ServiceAgreement Signature:", serviceAgreementSignatureResult.serviceAgreementSignature)
+
+    const service: Service = ddo.findServiceByType("Access")
+
+    const serviceAgreement: ServiceAgreement = await ocean.executeServiceAgreement(
+        ddo.id,
+        service.serviceDefinitionId,
+        serviceAgreementSignatureResult.serviceAgreementId,
+        serviceAgreementSignatureResult.serviceAgreementSignature,
+        consumer,
+        publisher)
+    Logger.log("ServiceAgreement Id:", serviceAgreement.getId())
+
+    const paid = await serviceAgreement.payAsset(assetId, metaData.base.price, consumer)
+    Logger.log(`Asset paid: ${paid}`)
+})()
diff --git a/src/examples/ExecuteAgreement.ts b/src/examples/ExecuteAgreement.ts
index f9d68c8..c48e783 100644
--- a/src/examples/ExecuteAgreement.ts
+++ b/src/examples/ExecuteAgreement.ts
@@ -3,18 +3,11 @@ import MetaData from "../ddo/MetaData"
 import MetaDataBase from "../ddo/MetaDataBase"
 import Service from "../ddo/Service"
 import {Account, Logger, Ocean, ServiceAgreement} from "../squid"
+import config from "./config"
 
 (async () => {
-    const ocean: Ocean = await Ocean.getInstance({
-        nodeUri: "http://localhost:8545",
-        aquariusUri: "http://localhost:5000",
-        brizoUri: "http://localhost:8030",
-        parityUri: "http://localhost:9545",
-        secretStoreUri: "http://localhost:12001",
-        threshold: 0,
-        password: "unittest",
-        address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
-    })
+
+    const ocean: Ocean = await Ocean.getInstance(config)
 
     const publisher: Account = (await ocean.getAccounts())[0]
     const consumer: Account = (await ocean.getAccounts())[1]
@@ -54,6 +47,8 @@ import {Account, Logger, Ocean, ServiceAgreement} from "../squid"
 
     const accessService = ddo.findServiceByType("Access")
 
+    await consumer.requestTokens(metaData.base.price)
+
     const serviceAgreementSignatureResult: any = await ocean.signServiceAgreement(ddo.id,
         accessService.serviceDefinitionId, consumer)
     Logger.log("ServiceAgreement Id:", serviceAgreementSignatureResult.serviceAgreementId)
diff --git a/src/examples/GetAccounts.ts b/src/examples/GetAccounts.ts
new file mode 100644
index 0000000..d895761
--- /dev/null
+++ b/src/examples/GetAccounts.ts
@@ -0,0 +1,11 @@
+import {Logger, Ocean} from "../squid"
+import config from "./config"
+
+(async () => {
+
+    const ocean: Ocean = await Ocean.getInstance(config)
+
+    const accounts = await ocean.getAccounts()
+
+    Logger.log(JSON.stringify(accounts, null, 2))
+})()
diff --git a/src/examples/GetBalance.ts b/src/examples/GetBalance.ts
new file mode 100644
index 0000000..1961943
--- /dev/null
+++ b/src/examples/GetBalance.ts
@@ -0,0 +1,10 @@
+import {Logger, Ocean} from "../squid"
+import config from "./config"
+
+(async () => {
+    const ocean: Ocean = await Ocean.getInstance(config)
+
+    const accounts = await ocean.getAccounts()
+
+    Logger.log(await accounts[0].getBalance())
+})()
diff --git a/src/examples/GetHDWalletAccounts.ts b/src/examples/GetHDWalletAccounts.ts
new file mode 100644
index 0000000..e285e2e
--- /dev/null
+++ b/src/examples/GetHDWalletAccounts.ts
@@ -0,0 +1,10 @@
+import {Logger, Ocean} from "../squid"
+import config from "./config"
+
+(async () => {
+    const ocean: Ocean = await Ocean.getInstance(config)
+
+    const accounts = await ocean.getAccounts()
+
+    Logger.log(JSON.stringify(accounts, null, 2))
+})()
diff --git a/src/examples/GrantAccess.ts b/src/examples/GrantAccess.ts
new file mode 100644
index 0000000..5da474a
--- /dev/null
+++ b/src/examples/GrantAccess.ts
@@ -0,0 +1,73 @@
+import DDO from "../ddo/DDO"
+import MetaData from "../ddo/MetaData"
+import MetaDataBase from "../ddo/MetaDataBase"
+import Service from "../ddo/Service"
+import {Account, Logger, Ocean, ServiceAgreement} from "../squid"
+import config from "./config"
+
+(async () => {
+    const ocean: Ocean = await Ocean.getInstance(config)
+
+    const publisher: Account = (await ocean.getAccounts())[0]
+    const consumer: Account = (await ocean.getAccounts())[1]
+
+    const metaData = new MetaData({
+        base: {
+            name: "Office Humidity",
+            type: "dataset",
+            description: "Weather information of UK including temperature and humidity",
+            size: "3.1gb",
+            dateCreated: "2012-02-01T10:55:11+00:00",
+            author: "Met Office",
+            license: "CC-BY",
+            copyrightHolder: "Met Office",
+            encoding: "UTF-8",
+            compression: "zip",
+            contentType: "text/csv",
+            // tslint:disable-next-line
+            workExample: "stationId,latitude,longitude,datetime,temperature,humidity423432fsd,51.509865,-0.118092,2011-01-01T10:55:11+00:00,7.2,68",
+            contentUrls: [
+                "https://testocnfiles.blob.core.windows.net/testfiles/testzkp.zip",
+                "https://testocnfiles.blob.core.windows.net/testfiles/testzkp.zip",
+            ],
+            links: [
+                {sample1: "http://data.ceda.ac.uk/badc/ukcp09/data/gridded-land-obs/gridded-land-obs-daily/"},
+                {sample2: "http://data.ceda.ac.uk/badc/ukcp09/data/gridded-land-obs/gridded-land-obs-averages-25km/"},
+                {fieldsDescription: "http://data.ceda.ac.uk/badc/ukcp09/"},
+            ],
+            inLanguage: "en",
+            tags: "weather, uk, 2011, temperature, humidity",
+            price: 10,
+        } as MetaDataBase,
+    } as MetaData)
+
+    const ddo: DDO = await ocean.registerAsset(metaData, publisher)
+    Logger.log("did", ddo.id)
+    const assetId = ddo.id.replace("did:op:", "")
+
+    const accessService = ddo.findServiceByType("Access")
+
+    const serviceAgreementSignatureResult: any = await ocean.signServiceAgreement(ddo.id,
+        accessService.serviceDefinitionId, consumer)
+    Logger.log("ServiceAgreement Id:", serviceAgreementSignatureResult.serviceAgreementId)
+    Logger.log("ServiceAgreement Signature:", serviceAgreementSignatureResult.serviceAgreementSignature)
+
+    const service: Service = ddo.findServiceByType("Access")
+
+    const serviceAgreement: ServiceAgreement = await ocean.executeServiceAgreement(
+        ddo.id,
+        service.serviceDefinitionId,
+        serviceAgreementSignatureResult.serviceAgreementId,
+        serviceAgreementSignatureResult.serviceAgreementSignature,
+        consumer,
+        publisher)
+    Logger.log("ServiceAgreement Id:", serviceAgreement.getId())
+
+    await consumer.requestTokens(metaData.base.price)
+
+    const paid = await serviceAgreement.payAsset(assetId, metaData.base.price, consumer)
+    Logger.log(`Asset paid: ${paid}`)
+
+    const accessGranted = await serviceAgreement.grantAccess(assetId, assetId, publisher)
+    Logger.log(`Asset access granted: ${accessGranted}`)
+})()
diff --git a/src/examples/InitializeAgreement.ts b/src/examples/InitializeAgreement.ts
index 5bf417f..8fde379 100644
--- a/src/examples/InitializeAgreement.ts
+++ b/src/examples/InitializeAgreement.ts
@@ -3,20 +3,12 @@ import MetaData from "../ddo/MetaData"
 import MetaDataBase from "../ddo/MetaDataBase"
 import Service from "../ddo/Service"
 import {Account, Logger, Ocean} from "../squid"
+import config from "./config"
 
 (async () => {
-    const ocean: Ocean = await Ocean.getInstance({
-        nodeUri: "http://localhost:8545",
-        aquariusUri: "http://localhost:5000",
-        brizoUri: "http://localhost:8030",
-        parityUri: "http://localhost:9545",
-        secretStoreUri: "http://localhost:12001",
-        threshold: 0,
-        password: "unittest",
-        address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
-    })
+    const ocean: Ocean = await Ocean.getInstance(config)
 
-    const publisher: Account = (await ocean.getAccounts())[0]
+    const publisher: Account = (await ocean.getAccounts())[1]
     const consumer: Account = (await ocean.getAccounts())[1]
 
     const metaData = new MetaData({
@@ -31,12 +23,11 @@ import {Account, Logger, Ocean} from "../squid"
             copyrightHolder: "Met Office",
             encoding: "UTF-8",
             compression: "zip",
-            contentType: "text/csv",
+            contentType: "Application/pdf",
             // tslint:disable-next-line
             workExample: "stationId,latitude,longitude,datetime,temperature,humidity423432fsd,51.509865,-0.118092,2011-01-01T10:55:11+00:00,7.2,68",
             contentUrls: [
-                "https://testocnfiles.blob.core.windows.net/testfiles/testzkp.zip",
-                "https://testocnfiles.blob.core.windows.net/testfiles/testzkp.zip",
+                "https://testocnfiles.blob.core.windows.net/testfiles/testzkp.pdf",
             ],
             links: [
                 {sample1: "http://data.ceda.ac.uk/badc/ukcp09/data/gridded-land-obs/gridded-land-obs-daily/"},
@@ -50,10 +41,12 @@ import {Account, Logger, Ocean} from "../squid"
     } as MetaData)
 
     const ddo: DDO = await ocean.registerAsset(metaData, publisher)
-    Logger.log("did", ddo.id)
+    Logger.log("Registered asset with did:", ddo.id)
 
     const accessService = ddo.findServiceByType("Access")
 
+    await consumer.requestTokens(100)
+
     const serviceAgreementSignatureResult: any = await ocean
         .signServiceAgreement(
             ddo.id,
diff --git a/src/examples/Listener.ts b/src/examples/Listener.ts
new file mode 100644
index 0000000..fb460a4
--- /dev/null
+++ b/src/examples/Listener.ts
@@ -0,0 +1,20 @@
+import {Logger, Ocean} from "../squid"
+// tslint:disable-next-line
+import EventListener from "../keeper/EventListener"
+import config from "./config"
+
+(async () => {
+    Ocean.getInstance(config)
+})()
+
+const event = EventListener.subscribe("OceanToken", "Transfer", {})
+
+Logger.log(`Listening to Transfer event of OceanToken`)
+
+event.listen((data: any[]) => {
+
+    Logger.log(Date.now())
+    Logger.log("From", data[0].returnValues.from)
+    Logger.log("To", data[0].returnValues.to)
+    Logger.log("Value", data[0].returnValues.value)
+})
diff --git a/src/examples/RegisterAsset.ts b/src/examples/RegisterAsset.ts
index 292fc6e..e13a821 100644
--- a/src/examples/RegisterAsset.ts
+++ b/src/examples/RegisterAsset.ts
@@ -2,18 +2,11 @@ import DDO from "../ddo/DDO"
 import MetaData from "../ddo/MetaData"
 import MetaDataBase from "../ddo/MetaDataBase"
 import {Account, Logger, Ocean} from "../squid"
+import config from "./config"
 
 (async () => {
-    const ocean: Ocean = await Ocean.getInstance({
-        nodeUri: "http://localhost:8545",
-        aquariusUri: "http://localhost:5000",
-        brizoUri: "http://localhost:8030",
-        parityUri: "http://localhost:9545",
-        secretStoreUri: "http://localhost:12001",
-        threshold: 0,
-        password: "unittest",
-        address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
-    })
+
+    const ocean: Ocean = await Ocean.getInstance(config)
 
     const publisher: Account = (await ocean.getAccounts())[0]
 
diff --git a/src/examples/RegisterServiceAgreementTemplates.ts b/src/examples/RegisterServiceAgreementTemplates.ts
index 6ffb422..e0d23af 100644
--- a/src/examples/RegisterServiceAgreementTemplates.ts
+++ b/src/examples/RegisterServiceAgreementTemplates.ts
@@ -1,22 +1,15 @@
 import {Account, Logger, Ocean, ServiceAgreementTemplate, Templates} from "../squid"
+import config from "./config"
 
 (async () => {
-    const ocean: Ocean = await Ocean.getInstance({
-        nodeUri: "http://localhost:8545",
-        aquariusUri: "http://localhost:5000",
-        brizoUri: "http://localhost:8030",
-        parityUri: "http://localhost:9545",
-        secretStoreUri: "http://localhost:12001",
-        threshold: 0,
-        password: "unittest",
-        address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
-    })
 
-    const templateOwner: Account = (await ocean.getAccounts())[5]
+    const ocean: Ocean = await Ocean.getInstance(config)
+
+    const templateOwner: Account = (await ocean.getAccounts())[0]
 
     const serviceAgreementTemplate: ServiceAgreementTemplate = new ServiceAgreementTemplate(new Templates.Access())
     const serviceAgreementRegistered: boolean = await serviceAgreementTemplate.register(templateOwner.getId())
 
-    Logger.log("ServiceAgreement registered:", serviceAgreementRegistered,
+    Logger.log("ServiceAgreementTemplate registered:", serviceAgreementRegistered,
         "templateId:", serviceAgreementTemplate.getId())
 })()
diff --git a/src/examples/Search.ts b/src/examples/Search.ts
index d0f0b06..c056291 100644
--- a/src/examples/Search.ts
+++ b/src/examples/Search.ts
@@ -1,17 +1,9 @@
 import DDO from "../ddo/DDO"
 import {Logger, Ocean} from "../squid"
+import config from "./config"
 
 (async () => {
-    const ocean: Ocean = await Ocean.getInstance({
-        nodeUri: "http://localhost:8545",
-        aquariusUri: "http://localhost:5000",
-        brizoUri: "http://localhost:8030",
-        parityUri: "http://localhost:9545",
-        secretStoreUri: "http://localhost:12001",
-        threshold: 0,
-        password: "unittest",
-        address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
-    })
+    const ocean: Ocean = await Ocean.getInstance(config)
 
     const result: DDO[] = await ocean.searchAssetsByText("Office Humidity")
     const names: string[] = result.map((ddo: DDO): string => {
diff --git a/src/examples/SignAgreement.ts b/src/examples/SignAgreement.ts
index 47d2bb7..80668bc 100644
--- a/src/examples/SignAgreement.ts
+++ b/src/examples/SignAgreement.ts
@@ -5,18 +5,10 @@ import MetaData from "../ddo/MetaData"
 import MetaDataBase from "../ddo/MetaDataBase"
 import Service from "../ddo/Service"
 import {Account, Logger, Ocean} from "../squid"
+import config from "./config"
 
 (async () => {
-    const ocean: Ocean = await Ocean.getInstance({
-        nodeUri: "http://localhost:8545",
-        aquariusUri: "http://localhost:5000",
-        brizoUri: "http://localhost:8030",
-        parityUri: "http://localhost:9545",
-        secretStoreUri: "http://localhost:12001",
-        threshold: 0,
-        password: "unittest",
-        address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
-    })
+    const ocean: Ocean = await Ocean.getInstance(config)
 
     const publisher: Account = (await ocean.getAccounts())[0]
     const consumer: Account = (await ocean.getAccounts())[1]
@@ -74,6 +66,9 @@ import {Account, Logger, Ocean} from "../squid"
     Logger.log("did", ddo.id)
 
     const accessService: Service = ddo.findServiceByType("Access")
+
+    await consumer.requestTokens(metaData.base.price)
+
     const serviceAgreementResult: any = await ocean
         .signServiceAgreement(
             ddo.id,
diff --git a/src/examples/config.ts b/src/examples/config.ts
new file mode 100644
index 0000000..bddea88
--- /dev/null
+++ b/src/examples/config.ts
@@ -0,0 +1,16 @@
+import * as HDWalletProvider from "truffle-hdwallet-provider"
+import Config from "../models/Config"
+import * as config from "./config/config.json"
+
+if (false) {
+    const seedphrase = "xxx"
+
+    // @ts-ignore
+    config.web3Provider = new HDWalletProvider(
+        seedphrase,
+        config.nodeUri,
+        0, 10,
+    )
+}
+
+export default config as Config
diff --git a/src/examples/config/config.json b/src/examples/config/config.json
new file mode 100644
index 0000000..f760ba1
--- /dev/null
+++ b/src/examples/config/config.json
@@ -0,0 +1,10 @@
+{
+  "nodeUri": "http://localhost:8545",
+  "aquariusUri": "http://aquarius.dev-ocean.com:5000",
+  "brizoUri": "http://localhost:8030",
+  "parityUri": "http://localhost:9545",
+  "secretStoreUri": "http://localhost:12001",
+  "threshold": 0,
+  "password": "secret",
+  "address": "0xa99d43d86a0758d5632313b8fa3972b6088a21bb"
+}
diff --git a/src/examples/fire_lazers.sh b/src/examples/fire_lazers.sh
index f521131..8080e59 100755
--- a/src/examples/fire_lazers.sh
+++ b/src/examples/fire_lazers.sh
@@ -2,8 +2,13 @@
 
 set -e
 
+# this has to go first
 npm run run src/examples/RegisterServiceAgreementTemplates.ts
+
+npm run run src/examples/BuyAsset.ts
+npm run run src/examples/ExecuteAgreement.ts
+npm run run src/examples/GetAccounts.ts
+npm run run src/examples/GetBalance.ts
+npm run run src/examples/GrantAccess.ts
 npm run run src/examples/RegisterAsset.ts
 npm run run src/examples/Search.ts
-npm run run src/examples/SignAgreement.ts
-npm run run src/examples/ExecuteAgreement.ts
diff --git a/src/keeper/Event.ts b/src/keeper/Event.ts
new file mode 100644
index 0000000..6dc4207
--- /dev/null
+++ b/src/keeper/Event.ts
@@ -0,0 +1,58 @@
+import GenericContract from "./contracts/GenericContract"
+import EventListener from "./EventListener"
+import Web3Provider from "./Web3Provider"
+// import Logger from "../utils/Logger"
+
+export default class Event {
+
+    private poller = null
+    private lastBlock: number = 0
+    private interval: number = 200
+
+    constructor(private contractName: string,
+                private eventName: string,
+                private filter: any) {
+
+    }
+
+    public stopListen() {
+        clearInterval(this.poller)
+        this.poller = null
+    }
+
+    public async listen(callback: any) {
+        this.lastBlock = await Web3Provider.getWeb3().eth.getBlockNumber() + 1
+
+        this.poller = setInterval(
+            () => this.handler(callback),
+            this.interval)
+    }
+
+    public listenOnce(callback: any) {
+        this.listen((events: any[]) => {
+            if (events) {
+                EventListener.unsubscribe(this)
+                callback(events[0])
+            }
+        })
+    }
+
+    private async handler(callback: any) {
+        const contract = await GenericContract.getInstance(this.contractName)
+
+        try {
+            const events = await contract.getEventData(this.eventName, {
+                filter: this.filter,
+                fromBlock: this.lastBlock,
+                toBlock: "latest",
+            })
+
+            if (events.length > 0) {
+                this.lastBlock = events[events.length - 1].blockNumber + 1
+                callback(events)
+            }
+        } catch (err) {
+            // Logger.log("err")
+        }
+    }
+}
diff --git a/src/keeper/EventListener.ts b/src/keeper/EventListener.ts
new file mode 100644
index 0000000..d150c58
--- /dev/null
+++ b/src/keeper/EventListener.ts
@@ -0,0 +1,29 @@
+import Event from "./Event"
+
+export default class EventListener {
+
+    public static subscribe(contractName: string,
+                            eventName: string,
+                            filter: any): Event {
+
+        const event = new Event(contractName, eventName, filter)
+        EventListener.events.push(event)
+
+        return event
+    }
+
+    public static unsubscribe(event): boolean {
+        event.stopListen()
+        const i = EventListener.events.indexOf(event)
+        if (i > -1) {
+            EventListener.events.splice(i, 1)
+        }
+        return true
+    }
+
+    public static count() {
+        return EventListener.events.length
+    }
+
+    private static events: Event[] = []
+}
diff --git a/src/keeper/Keeper.ts b/src/keeper/Keeper.ts
index e278cdb..e96c08f 100644
--- a/src/keeper/Keeper.ts
+++ b/src/keeper/Keeper.ts
@@ -1,3 +1,4 @@
+// import Logger from "../utils/Logger"
 import OceanAuth from "./contracts/Auth"
 import AccessConditions from "./contracts/conditions/AccessConditions"
 import PaymentConditions from "./contracts/conditions/PaymentConditions"
@@ -53,13 +54,24 @@ export default class Keeper {
                     case 4:
                         network = "Rinkeby"
                         break
+                    case 77:
+                        network = "POA_Sokol"
+                        break
+                    case 99:
+                        network = "POA_Core"
+                        break
                     case 42:
                         network = "Kovan"
                         break
+                    case 8996:
+                        network = "Spree"
+                        // network = "ocean_poa_net_local"
+                        break
                     case 8995:
-                        network = "Ocean_POA_AWS"
+                        network = "Nile"
                         break
                     default:
+                        // Logger.log(`NetworkId ${networkId} not found defaulting`)
                         network = "Development"
                 }
                 return network
diff --git a/src/keeper/contracts/ContractBase.ts b/src/keeper/contracts/ContractBase.ts
index a916d2a..1b23262 100644
--- a/src/keeper/contracts/ContractBase.ts
+++ b/src/keeper/contracts/ContractBase.ts
@@ -15,22 +15,6 @@ export default abstract class ContractBase {
         this.contractName = contractName
     }
 
-    /*
-    public async listenToEventOnce(eventName: string, options: any): Promise<any> {
-        return new Promise<any>((resolve, reject) => {
-            if (!this.contract.events[eventName]) {
-                throw new Error(`Event ${eventName} not found on contract ${this.contractName}`)
-            }
-            this.contract.events[eventName](options, (err) => {
-                reject(err)
-            })
-                .on("data", (eventData: any) => {
-                    resolve(eventData)
-                })
-        })
-    }
-    */
-
     public async getEventData(eventName: any, options: any): Promise<Event[]> {
         if (!this.contract.events[eventName]) {
             throw new Error(`Event "${eventName}" not found on contract "${this.contractName}"`)
diff --git a/src/keeper/contracts/ServiceAgreement.ts b/src/keeper/contracts/ServiceAgreement.ts
index db09194..c2637b4 100644
--- a/src/keeper/contracts/ServiceAgreement.ts
+++ b/src/keeper/contracts/ServiceAgreement.ts
@@ -25,6 +25,8 @@ export default class ServiceAgreement extends ContractBase {
         ])
     }
 
+    // todo get service agreement consumer
+
     public async getTemplateStatus(templateId: string) {
 
         return this.call("getTemplateStatus", [templateId])
@@ -47,7 +49,7 @@ export default class ServiceAgreement extends ContractBase {
 
         return this.send("executeAgreement", publisherAddress, [
             serviceAgreementTemplateId, serviceAgreementSignatureHash, consumerAddress, valueHashes,
-            timeoutValues, "0x" + serviceAgreementId, "0x" + did.replace("did:op:", ""),
+            timeoutValues, serviceAgreementId, "0x" + did.replace("did:op:", ""),
         ])
     }
 }
diff --git a/src/keeper/contracts/conditions/AccessConditions.ts b/src/keeper/contracts/conditions/AccessConditions.ts
index 6bd5e65..9eacfea 100644
--- a/src/keeper/contracts/conditions/AccessConditions.ts
+++ b/src/keeper/contracts/conditions/AccessConditions.ts
@@ -9,6 +9,8 @@ export default class AccessConditions extends ContractBase {
         return accessConditions
     }
 
+    // todo add check permissions proxy
+
     public async grantAccess(serviceAgreementId: any, assetId: any, documentKeyId: any, publisherAddress: string)
         : Promise<Receipt> {
         return this.send("grantAccess", publisherAddress, [
diff --git a/src/ocean/Account.ts b/src/ocean/Account.ts
index ccafbf7..f85dcf1 100644
--- a/src/ocean/Account.ts
+++ b/src/ocean/Account.ts
@@ -14,7 +14,9 @@ export default class Account extends OceanBase {
 
     public async getEtherBalance(): Promise<number> {
         // Logger.log("getting balance for", account);
-        return Web3Provider.getWeb3().eth
+        return Web3Provider
+            .getWeb3()
+            .eth
             .getBalance(this.id, "latest")
             .then((balance: string): number => {
                 // Logger.log("balance", balance);
@@ -35,7 +37,9 @@ export default class Account extends OceanBase {
     }
 
     public async requestTokens(amount: number): Promise<number> {
-        await (await Keeper.getInstance()).market.requestTokens(amount, this.id)
+        await (await Keeper.getInstance())
+            .market
+            .requestTokens(amount, this.id)
         return amount
     }
 
diff --git a/src/ocean/Ocean.ts b/src/ocean/Ocean.ts
index 4784da7..23ee5be 100644
--- a/src/ocean/Ocean.ts
+++ b/src/ocean/Ocean.ts
@@ -1,15 +1,18 @@
+import {saveAs} from "file-saver"
 import AquariusProvider from "../aquarius/AquariusProvider"
 import SearchQuery from "../aquarius/query/SearchQuery"
 import BrizoProvider from "../brizo/BrizoProvider"
 import ConfigProvider from "../ConfigProvider"
 import Authentication from "../ddo/Authentication"
-import DDOCondition from "../ddo/Condition"
+import Condition from "../ddo/Condition"
+import Contract from "../ddo/Contract"
 import DDO from "../ddo/DDO"
 import Event from "../ddo/Event"
-import EventHandlers from "../ddo/EventHandlers"
+import EventHandler from "../ddo/EventHandler"
 import MetaData from "../ddo/MetaData"
-import Parameter from "../ddo/Parameter"
+import PublicKey from "../ddo/PublicKey"
 import Service from "../ddo/Service"
+import ContractEvent from "../keeper/Event"
 import Keeper from "../keeper/Keeper"
 import Web3Provider from "../keeper/Web3Provider"
 import Config from "../models/Config"
@@ -18,11 +21,13 @@ import SecretStoreProvider from "../secretstore/SecretStoreProvider"
 import Logger from "../utils/Logger"
 import Account from "./Account"
 import IdGenerator from "./IdGenerator"
-import Condition from "./ServiceAgreements/Condition"
 import ServiceAgreement from "./ServiceAgreements/ServiceAgreement"
 import ServiceAgreementTemplate from "./ServiceAgreements/ServiceAgreementTemplate"
 import Access from "./ServiceAgreements/Templates/Access"
 
+import EventListener from "../keeper/EventListener"
+import WebServiceConnectorProvider from "../utils/WebServiceConnectorProvider"
+
 export default class Ocean {
 
     public static async getInstance(config: Config) {
@@ -62,74 +67,19 @@ export default class Ocean {
         const aquarius = AquariusProvider.getAquarius()
         const brizo = BrizoProvider.getBrizo()
 
-        const id: string = IdGenerator.generateId()
-        const did: string = `did:op:${id}`
-        const serviceDefinitionId: string = IdGenerator.generatePrefixedId()
+        const assetId: string = IdGenerator.generateId()
+        const did: string = `did:op:${assetId}`
+        const accessServiceDefinitionId: string = "0"
+        const computeServiceDefintionId: string = "1"
+        const metadataServiceDefinitionId: string = "2"
 
         metadata.base.contentUrls =
-            await SecretStoreProvider.getSecretStore().encryptDocument(id, metadata.base.contentUrls)
+            [await SecretStoreProvider.getSecretStore().encryptDocument(assetId, metadata.base.contentUrls)]
 
         const template = new Access()
         const serviceAgreementTemplate = new ServiceAgreementTemplate(template)
 
-        // get condition keys from template
-        const conditions: Condition[] = await serviceAgreementTemplate.getConditions()
-
-        // create ddo conditions out of the keys
-        const ddoConditions: DDOCondition[] = conditions
-            .map((condition: Condition, index: number): DDOCondition => {
-                const events: Event[] = [
-                    {
-                        name: "PaymentReleased",
-                        actorType: [
-                            "consumer",
-                        ],
-                        handlers: {
-                            moduleName: "serviceAgreement",
-                            functionName: "fulfillAgreement",
-                            version: "0.1",
-                        } as EventHandlers,
-                    } as Event,
-                ]
-
-                const mapParameterValueToName = (name) => {
-
-                    switch (name) {
-                        case "price":
-                            return metadata.base.price
-                        case "assetId":
-                            return "0x" + id
-                        case "documentKeyId":
-                            return "0x1234"
-                    }
-
-                    return null
-                }
-
-                const parameters: Parameter[] = condition.parameters.map((parameter: Parameter) => {
-                    return {
-                        name: parameter.name,
-                        type: parameter.type,
-                        value: mapParameterValueToName(parameter.name),
-                    } as Parameter
-                })
-
-                // Logger.log(`${condition.methodReflection.contractName}.${condition.methodReflection.methodName}`,
-                //    JSON.stringify(parameters, null, 2))
-
-                return {
-                    contractName: condition.methodReflection.contractName,
-                    methodName: condition.methodReflection.methodName,
-                    timeout: condition.timeout,
-                    index,
-                    conditionKey: condition.condtionKey,
-                    parameters,
-                    events,
-                    dependencies: condition.dependencies,
-                    dependencyTimeoutFlags: condition.dependencyTimeoutFlags,
-                    isTerminalCondition: condition.isTerminalCondition,
-                } as DDOCondition
-            })
+        const conditions: Condition[] = await serviceAgreementTemplate.getConditions(metadata, assetId)
 
         const serviceEndpoint = aquarius.getServiceEndpoint(did)
 
@@ -143,37 +93,47 @@ export default class Ocean {
             publicKey: [
                 {
                     id: did + "#keys-1",
-                },
-                {
                     type: "Ed25519VerificationKey2018",
-                },
-                {
                     owner: did,
-                },
-                {
                     publicKeyBase58: await publisher.getPublicKey(),
-                },
+                } as PublicKey,
             ],
             service: [
                 {
                     type: template.templateName,
                     purchaseEndpoint: brizo.getPurchaseEndpoint(),
-                    serviceEndpoint: brizo.getConsumeEndpoint(publisher.getId(),
-                        serviceDefinitionId, metadata.base.contentUrls[0]),
+                    serviceEndpoint: brizo.getConsumeEndpoint(),
                     // the id of the service agreement?
-                    serviceDefinitionId,
+                    serviceDefinitionId: accessServiceDefinitionId,
                     // the id of the service agreement template
                     templateId: serviceAgreementTemplate.getId(),
-                    conditions: ddoConditions,
+                    serviceAgreementContract: {
+                        contractName: "ServiceAgreement",
+                        fulfillmentOperator: template.fulfillmentOperator,
+                        events: [
+                            {
+                                name: "ExecuteAgreement",
+                                actorType: "consumer",
+                                handler: {
+                                    moduleName: "payment",
+                                    functionName: "lockPayment",
+                                    version: "0.1",
+                                } as EventHandler,
+                            } as Event,
+                        ],
+                    } as Contract,
+                    conditions,
                 } as Service,
                 {
                     type: "Compute",
                     serviceEndpoint: brizo.getComputeEndpoint(publisher.getId(),
-                        serviceDefinitionId, "xxx", "xxx"),
+                        computeServiceDefintionId, "xxx", "xxx"),
+                    serviceDefinitionId: computeServiceDefintionId,
                 } as Service,
                 {
                     type: "Metadata",
                     serviceEndpoint,
+                    serviceDefinitionId: metadataServiceDefinitionId,
                     metadata,
                 } as Service,
             ],
@@ -181,9 +141,11 @@ export default class Ocean {
 
         const storedDdo = await aquarius.storeDDO(ddo)
 
+        // Logger.log(JSON.stringify(storedDdo, null, 2))
+
         await didRegistry.registerAttribute(
-            id,
-            ValueType.DID,
+            assetId,
+            ValueType.URL,
             "Metadata",
             serviceEndpoint,
             publisher.getId())
@@ -197,11 +159,63 @@ export default class Ocean {
 
         const ddo = await AquariusProvider.getAquarius().retrieveDDO(did)
         const id = did.replace("did:op:", "")
-        const serviceAgreementId: string = IdGenerator.generateId()
+        const serviceAgreementId: string = IdGenerator.generatePrefixedId()
 
         try {
             const serviceAgreementSignature: string = await ServiceAgreement.signServiceAgreement(id,
                 ddo, serviceDefinitionId, serviceAgreementId, consumer)
+
+            const accessService: Service = ddo.findServiceByType("Access")
+            const metadataService: Service = ddo.findServiceByType("Metadata")
+
+            const price = metadataService.metadata.base.price
+            const balance = await consumer.getOceanBalance()
+            if (balance < price) {
+                throw new Error(`Not enough ocean tokens! Should have ${price} but has ${balance}`)
+            }
+
+            const event: ContractEvent = EventListener.subscribe(
+                accessService.serviceAgreementContract.contractName,
+                accessService.serviceAgreementContract.events[0].name, {
+                    serviceAgreementId,
+                })
+
+            event.listenOnce(async (data) => {
+
+                const sa: ServiceAgreement = new ServiceAgreement(data.returnValues.serviceAgreementId)
+                await sa.payAsset(id,
+                    metadataService.metadata.base.price,
+                    consumer,
+                )
+                Logger.log("Completed asset payment, now access should be granted.")
+            })
+            const accessEvent: ContractEvent = EventListener.subscribe(
+                accessService.conditions[1].contractName,
+                accessService.conditions[1].events[1].name, {})
+            accessEvent.listenOnce(async (data) => {
+                Logger.log("Awesome; got a AccessGranted Event. Let's download the asset files.")
+                const webConnector = WebServiceConnectorProvider.getConnector()
+                const contentUrls = await SecretStoreProvider.getSecretStore()
+                    .decryptDocument(id, metadataService.metadata.base.contentUrls[0])
+                const serviceUrl: string = accessService.serviceEndpoint
+                Logger.log("Consuming asset files using service url: ", serviceUrl)
+                for (const cUrl of contentUrls) {
+                    let url: string = serviceUrl + `?url=${cUrl}`
+                    url = url + `&serviceAgreementId=${serviceAgreementId}`
+                    url = url + `&consumerAddress=${consumer.getId()}`
+                    Logger.log("Fetching asset from: ", url)
+                    const response: any = await webConnector.get(url)
+                    const buffer: Buffer = await response.buffer()
+                    const parts: string[] = cUrl.split("/")
+                    const filename: string = parts[parts.length - 1]
+                    Logger.debug(`Got response: filename is ${filename}, url is ${response.url}`)
+                    const target = `${__dirname}/downloads/${filename}`
+                    await saveAs([buffer.toString("utf8")], filename)
+                    Logger.log("saved file to:", target)
+                }
+                Logger.log("Done downloading asset files.")
+            })
+
             return {
                 serviceAgreementId,
                 serviceAgreementSignature,
@@ -224,9 +238,9 @@ export default class Ocean {
                 serviceAgreementId,
                 serviceDefinitionId,
                 serviceAgreementSignature,
-                await consumer.getPublicKey())
+                consumer.getId())
 
-        Logger.log(result)
+        Logger.log(result.status)
     }
 
     public async executeServiceAgreement(did: string,
diff --git a/src/ocean/ServiceAgreements/Condition.ts b/src/ocean/ServiceAgreements/Condition.ts
index b8db3d6..4af0c4e 100644
--- a/src/ocean/ServiceAgreements/Condition.ts
+++ b/src/ocean/ServiceAgreements/Condition.ts
@@ -1,3 +1,4 @@
+import Event from "../../ddo/Event"
 import MethodReflection from "../../models/MethodReflection"
 import Parameter from "./Parameter"
 
@@ -8,5 +9,6 @@ export default class Condition {
     public dependencyTimeoutFlags: number[]
     public isTerminalCondition: boolean
     public timeout: number
+    public events: Event[]
     public parameters: Parameter[]
 }
diff --git a/src/ocean/ServiceAgreements/Event.ts b/src/ocean/ServiceAgreements/Event.ts
new file mode 100644
index 0000000..4ba5249
--- /dev/null
+++ b/src/ocean/ServiceAgreements/Event.ts
@@ -0,0 +1,7 @@
+import EventHandler from "./EventHandler"
+
+export default class Event {
+    public name: string = "PaymentLocked"
+    public actorType: string = "publisher"
+    public handler: EventHandler
+}
diff --git a/src/ocean/ServiceAgreements/EventHandler.ts b/src/ocean/ServiceAgreements/EventHandler.ts
new file mode 100644
index 0000000..978b855
--- /dev/null
+++ b/src/ocean/ServiceAgreements/EventHandler.ts
@@ -0,0 +1,5 @@
+export default class EventHandler {
+    public moduleName: string = "accessControl"
+    public functionName: string = "grantAccess"
+    public version: string = "0.1"
+}
diff --git a/src/ocean/ServiceAgreements/Method.ts b/src/ocean/ServiceAgreements/Method.ts
index 1e31f46..9f4e169 100644
--- a/src/ocean/ServiceAgreements/Method.ts
+++ b/src/ocean/ServiceAgreements/Method.ts
@@ -1,3 +1,4 @@
+import Event from "./Event"
 import Parameter from "./Parameter"
 
 export default class Method {
@@ -6,6 +7,7 @@ export default class Method {
     public methodName: string
     public timeout: number
     public parameters: Parameter[]
+    public events: Event[]
     public dependencies: string[]
     public dependencyTimeoutFlags: number[]
     public isTerminalCondition: boolean
diff --git a/src/ocean/ServiceAgreements/ServiceAgreement.ts b/src/ocean/ServiceAgreements/ServiceAgreement.ts
index 0f0302b..b7fe848 100644
--- a/src/ocean/ServiceAgreements/ServiceAgreement.ts
+++ b/src/ocean/ServiceAgreements/ServiceAgreement.ts
@@ -117,11 +117,6 @@ export default class ServiceAgreement extends OceanBase {
 
         return new ServiceAgreement(
             executeAgreementReceipt.events.ExecuteAgreement.returnValues.serviceAgreementId,
-            ddo,
-            publisher,
-            new Account(consumerAddress),
-            executeAgreementReceipt.events.ExecuteAgreement.returnValues.state,
-            executeAgreementReceipt.events.ExecuteAgreement.returnValues.status,
         )
     }
 
@@ -186,7 +181,7 @@ export default class ServiceAgreement extends OceanBase {
 
                 contionValues.push({
                     type: parameter.type,
-                    value: parameter.name === "serviceId" ? "0x" + serviceAgreementId : parameter.value,
+                    value: parameter.name === "serviceId" ? serviceAgreementId : parameter.value,
                 } as ValuePair)
             })
 
@@ -196,16 +191,11 @@ export default class ServiceAgreement extends OceanBase {
         return values
     }
 
-    private constructor(serviceAgreementId: string,
-                        ddo: DDO,
-                        private publisher: Account,
-                        consumer: Account,
-                        state: boolean,
-                        status: boolean) {
+    constructor(serviceAgreementId: string) {
         super(serviceAgreementId)
     }
 
-    public async buyAsset(assetId: string, price: number, consumer: Account): Promise<boolean> {
+    public async payAsset(assetId: string, price: number, consumer: Account): Promise<boolean> {
         const {paymentConditions, token} = await Keeper.getInstance()
 
         await token.approve(paymentConditions.getAddress(), price, consumer.getId())
@@ -217,12 +207,11 @@ export default class ServiceAgreement extends OceanBase {
         return lockPaymentReceipt.status
     }
 
-    public async grantAccess(assetId: string, documentId: string): Promise<boolean> {
+    public async grantAccess(assetId: string, documentId: string, publisher: Account): Promise<boolean> {
         const {accessConditions} = await Keeper.getInstance()
 
         const grantAccessReceipt =
-            await accessConditions.grantAccess(this.getId(), assetId, documentId,
-                this.publisher.getId())
+            await accessConditions.grantAccess(this.getId(), assetId, documentId, publisher.getId())
 
         return !!grantAccessReceipt.events.AccessGranted
     }
diff --git a/src/ocean/ServiceAgreements/ServiceAgreementTemplate.ts b/src/ocean/ServiceAgreements/ServiceAgreementTemplate.ts
index 32317c5..657aca8 100644
--- a/src/ocean/ServiceAgreements/ServiceAgreementTemplate.ts
+++ b/src/ocean/ServiceAgreements/ServiceAgreementTemplate.ts
@@ -1,3 +1,7 @@
+import DDOCondition from "../../ddo/Condition"
+import Dependency from "../../ddo/Dependency"
+import MetaData from "../../ddo/MetaData"
+import Parameter from "../../ddo/Parameter"
 import ContractReflector from "../../keeper/ContractReflector"
 import Keeper from "../../keeper/Keeper"
 import Web3Provider from "../../keeper/Web3Provider"
@@ -96,7 +100,58 @@ export default class ServiceAgreementTemplate extends OceanBase {
         return new Account(await serviceAgreement.getTemplateOwner(this.id))
     }
 
-    public async getConditions(): Promise<Condition[]> {
+    public async getConditions(metadata: MetaData, assetId: string): Promise<DDOCondition[]> {
+        const conditions = await this.blendConditions()
+        return conditions.map((condition: Condition, index: number): DDOCondition => {
+
+            const mapParameterValueToName = (name) => {
+
+                switch (name) {
+                    case "price":
+                        return metadata.base.price
+                    case "assetId":
+                        return "0x" + assetId
+                    case "documentKeyId":
+                        return "0x" + assetId
+                }
+
+                return null
+            }
+
+            const parameters: Parameter[] = condition.parameters.map((parameter: Parameter) => {
+                return {
+                    name: parameter.name,
+                    type: parameter.type,
+                    value: mapParameterValueToName(parameter.name),
+                } as Parameter
+            })
+
+            // Logger.log(`${condition.methodReflection.contractName}.${condition.methodReflection.methodName}`,
+            //    JSON.stringify(parameters, null, 2))
+
+            const dependencies: Dependency[] = condition.dependencies.map((dep, i) => {
+                return {
+                    name: dep,
+                    timeout: condition.dependencyTimeoutFlags[i],
+                } as Dependency
+            })
+
+            return {
+                name: condition.methodReflection.methodName,
+                dependencies,
+                timeout: condition.timeout,
+                isTerminalCondition: condition.isTerminalCondition,
+                conditionKey: condition.condtionKey,
+                contractName: condition.methodReflection.contractName,
+                functionName: condition.methodReflection.methodName,
+                index,
+                parameters,
+                events: condition.events,
+            } as DDOCondition
+        })
+    }
+
+    private async blendConditions(): Promise<Condition[]> {
         const methodReflections = await this.getMethodReflections()
 
         const conditions: Condition[] = methodReflections.map((methodReflection, i) => {
@@ -104,6 +159,7 @@ export default class ServiceAgreementTemplate extends OceanBase {
             return {
                 methodReflection,
                 timeout: method.timeout,
+                events: method.events,
                 parameters: method.parameters,
                 dependencies: method.dependencies,
                 dependencyTimeoutFlags: method.dependencyTimeoutFlags,
diff --git a/src/ocean/ServiceAgreements/Templates/Access.ts b/src/ocean/ServiceAgreements/Templates/Access.ts
index 8c41126..b96b9bb 100644
--- a/src/ocean/ServiceAgreements/Templates/Access.ts
+++ b/src/ocean/ServiceAgreements/Templates/Access.ts
@@ -1,4 +1,7 @@
+import Event from "../Event"
+import EventHandler from "../EventHandler"
 import Method from "../Method"
+import Parameter from "../Parameter"
 import TemplateBase from "./TemplateBase"
 
 export default class Access extends TemplateBase {
@@ -15,68 +18,124 @@ export default class Access extends TemplateBase {
                 {
                     name: "assetId",
                     type: "bytes32",
-                },
-                {
+                } as Parameter, {
                     name: "price",
                     type: "uint256",
-                },
+                } as Parameter,
+            ],
+            events: [
+                {
+                    name: "PaymentLocked",
+                    actorType: "publisher",
+                    handler: {
+                        moduleName: "accessControl",
+                        functionName: "grantAccess",
+                        version: "0.1",
+                    } as EventHandler,
+                } as Event,
             ],
             dependencies: [],
             dependencyTimeoutFlags: [],
             isTerminalCondition: false,
-        } as Method,
-        {
+        } as Method, {
             name: "grantAccess",
             contractName: "AccessConditions",
             methodName: "grantAccess",
-            timeout: 10,
+            timeout: 0,
             parameters: [
                 {
                     name: "assetId",
                     type: "bytes32",
-                },
+                } as Parameter,
                 {
                     name: "documentKeyId",
                     type: "bytes32",
-                },
+                } as Parameter,
+            ],
+            events: [
+                {
+                    name: "AccessGranted",
+                    actorType: "publisher",
+                    handler: {
+                        moduleName: "payment",
+                        functionName: "releasePayment",
+                        version: "0.1",
+                    } as EventHandler,
+                } as Event,
+                {
+                    name: "AccessGranted",
+                    actorType: "consumer",
+                    handler: {
+                        moduleName: "accessControl",
+                        functionName: "consumeAsset",
+                        version: "0.1",
+                    } as EventHandler,
+                } as Event,
+                {
+                    name: "AccessTimeout",
+                    actorType: "consumer",
+                    handler: {
+                        moduleName: "payment",
+                        functionName: "refundPayment",
+                        version: "0.1",
+                    } as EventHandler,
+                } as Event,
             ],
             dependencies: ["lockPayment"],
             dependencyTimeoutFlags: [0],
             isTerminalCondition: false,
-        } as Method,
-        {
+        } as Method, {
             name: "releasePayment",
             contractName: "PaymentConditions",
             methodName: "releasePayment",
-            timeout: 10,
+            timeout: 0,
             parameters: [
                 {
                     name: "assetId",
                     type: "bytes32",
-                },
-                {
+                } as Parameter, {
                     name: "price",
                     type: "uint256",
-                },
+                } as Parameter,
+            ],
+            events: [
+                {
+                    name: "PaymentReleased",
+                    actorType: "consumer",
+                    handler: {
+                        moduleName: "serviceAgreement",
+                        functionName: "fulfillAgreement",
+                        version: "0.1",
+                    } as EventHandler,
+                } as Event,
             ],
             dependencies: ["grantAccess"],
             dependencyTimeoutFlags: [0],
             isTerminalCondition: true,
-        } as Method,
-        {
+        } as Method, {
             name: "refundPayment",
             contractName: "PaymentConditions",
             methodName: "refundPayment",
-            timeout: 10,
+            timeout: 10 * 60,
             parameters: [
                 {
                     name: "assetId",
                     type: "bytes32",
-                },
-                {
+                } as Parameter, {
                     name: "price",
                     type: "uint256",
-                },
+                } as Parameter,
+            ],
+            events: [
+                {
+                    name: "PaymentRefund",
+                    actorType: "publisher",
+                    handler: {
+                        moduleName: "serviceAgreement",
+                        functionName: "terminateAgreement",
+                        version: "0.1",
+                    } as EventHandler,
+                } as Event,
             ],
             dependencies: ["lockPayment", "grantAccess"],
             dependencyTimeoutFlags: [0, 1],
diff --git a/test/config.ts b/test/config.ts
index 375016e..f18bfa2 100644
--- a/test/config.ts
+++ b/test/config.ts
@@ -6,8 +6,4 @@ export default {
     nodeUri: "http://localhost:8545",
     parityUri: "http://localhost:9545",
     secretStoreUri: "http://localhost:12001",
-    threshold: 0,
-    password: "unittest",
-    address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
-    web3Provider: null,
 } as Config
diff --git a/test/keeper/Event.test.ts b/test/keeper/Event.test.ts
new file mode 100644
index 0000000..a0f06a7
--- /dev/null
+++ b/test/keeper/Event.test.ts
@@ -0,0 +1,82 @@
+import {assert} from "chai"
+import ConfigProvider from "../../src/ConfigProvider"
+import EventListener from "../../src/keeper/EventListener"
+import Keeper from "../../src/keeper/Keeper"
+import Account from "../../src/ocean/Account"
+import Ocean from "../../src/ocean/Ocean"
+import config from "../config"
+import TestContractHandler from "./TestContractHandler"
+
+let keeper: Keeper
+let ocean: Ocean
+let accounts: Account[]
+
+describe("EventListener", () => {
+
+    before(async () => {
+        ConfigProvider.setConfig(config)
+        await TestContractHandler.prepareContracts()
+        keeper = await Keeper.getInstance()
+        assert(keeper)
+        ocean = await Ocean.getInstance(config)
+        assert(ocean)
+        accounts = await ocean.getAccounts()
+        assert(accounts)
+    })
+
+    describe("#listen()", () => {
+
+        it("should listen to an event", (done) => {
+
+            const acc = accounts[1]
+
+            const event = EventListener.subscribe("OceanToken",
+                "Transfer",
+                {
+                    to: acc.getId(),
+                })
+
+            event.listen((events) => {
+
+                assert(events)
+                assert(events.length === 2)
+                done()
+                EventListener.unsubscribe(event)
+            })
+
+            const {market} = keeper
+
+            market.requestTokens(400, acc.getId())
+            market.requestTokens(400, acc.getId())
+        })
+    })
+
+    describe("#listenOnce()", () => {
+
+        it("should listen once", (done) => {
+
+            const acc = accounts[1]
+
+            const countBefore = EventListener.count()
+            const event = EventListener.subscribe("OceanToken",
+                "Transfer",
+                {
+                    to: acc.getId(),
+                })
+
+            event.listenOnce(
+                (data: any) => {
+
+                    assert(data)
+                    assert(data.blockNumber)
+                    assert(EventListener.count() === countBefore)
+                    done()
+                })
+
+            const {market} = keeper
+
+            market.requestTokens(400, acc.getId())
+        })
+    })
+
+})
diff --git a/test/keeper/EventListener.test.ts b/test/keeper/EventListener.test.ts
new file mode 100644
index 0000000..bc3eb88
--- /dev/null
+++ b/test/keeper/EventListener.test.ts
@@ -0,0 +1,69 @@
+import {assert} from "chai"
+import ConfigProvider from "../../src/ConfigProvider"
+import EventListener from "../../src/keeper/EventListener"
+import Keeper from "../../src/keeper/Keeper"
+import Account from "../../src/ocean/Account"
+import Ocean from "../../src/ocean/Ocean"
+import config from "../config"
+import TestContractHandler from "./TestContractHandler"
+
+let keeper: Keeper
+let ocean: Ocean
+let accounts: Account[]
+
+describe("EventListener", () => {
+
+    before(async () => {
+        ConfigProvider.setConfig(config)
+        await TestContractHandler.prepareContracts()
+        keeper = await Keeper.getInstance()
+        assert(keeper)
+        ocean = await Ocean.getInstance(config)
+        assert(ocean)
+        accounts = await ocean.getAccounts()
+        assert(accounts)
+    })
+
+    describe("#subscribe()", () => {
+
+        it("should subscribe to an event", (done) => {
+
+            const acc = accounts[1]
+            const countBefore = EventListener.count()
+
+            const event = EventListener.subscribe("OceanToken",
+                "Transfer",
+                {
+                    to: acc.getId(),
+                })
+            assert(event)
+
+            const countAfter = EventListener.count()
+            assert(countBefore + 1 === countAfter, `${countBefore}${countAfter}`)
+
+            EventListener.unsubscribe(event)
+            done()
+        })
+    })
+
+    describe("#unsubscribe()", () => {
+
+        it("should unsubscribe from an event", (done) => {
+
+            const countBefore = EventListener.count()
+            const event = EventListener.subscribe("OceanToken",
+                "Transfer",
+                {})
+            const count = EventListener.count()
+
+            const unsubscribed = EventListener.unsubscribe(event)
+            assert(unsubscribed)
+
+            const countAfter = EventListener.count()
+            assert(count > countBefore, `${count}${countAfter}`)
+            assert(countBefore === countAfter, `${countBefore}${countAfter}`)
+            done()
+        })
+    })
+
+})
diff --git a/test/ocean/Account.test.ts b/test/ocean/Account.test.ts
index 209d76a..b07b10e 100644
--- a/test/ocean/Account.test.ts
+++ b/test/ocean/Account.test.ts
@@ -47,7 +47,8 @@ describe("Account", () => {
             const balance = await account.getEtherBalance()
             const web3 = Web3Provider.getWeb3()
 
-            assert(Number(web3.utils.toWei("100", "ether")) === balance)
+            assert(Number(web3.utils.toWei("100", "ether")) === balance,
+                `ether did not match ${balance}`)
         })
     })
 
@@ -59,8 +60,9 @@ describe("Account", () => {
             const balance = await account.getBalance()
             const web3 = Web3Provider.getWeb3()
 
-            assert(Number(web3.utils.toWei("100", "ether")) === balance.eth)
-            assert(0 === balance.ocn)
+            assert(Number(web3.utils.toWei("100", "ether")) === balance.eth,
+                `ether did not match ${balance.eth}`)
+            assert(0 === balance.ocn, `tokens did not match ${balance.ocn}`)
         })
     })
 
diff --git a/test/ocean/Ocean.test.ts b/test/ocean/Ocean.test.ts
index 39c0f17..f95898b 100644
--- a/test/ocean/Ocean.test.ts
+++ b/test/ocean/Ocean.test.ts
@@ -127,20 +127,24 @@ describe("Ocean", () => {
             const publisher = accounts[0]
             const consumer = accounts[1]
 
-            const ddo: DDO = await ocean.registerAsset(new MetaData(), publisher)
+            const metaData = new MetaData()
+            const ddo: DDO = await ocean.registerAsset(metaData, publisher)
 
             const service: Service = ddo.findServiceByType("Access")
 
             // @ts-ignore
             WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
 
-            const serviceAgreementSignature: any = await ocean.signServiceAgreement(ddo.id,
+            await consumer.requestTokens(metaData.base.price)
+
+            const signServiceAgreementResult: any = await ocean.signServiceAgreement(ddo.id,
                 service.serviceDefinitionId, consumer)
 
-            assert(serviceAgreementSignature)
-            assert(serviceAgreementSignature.serviceAgreementId)
-            assert(serviceAgreementSignature.serviceAgreementSignature)
-            assert(serviceAgreementSignature.serviceAgreementSignature.startsWith("0x"))
+            assert(signServiceAgreementResult)
+            assert(signServiceAgreementResult.serviceAgreementId, "no serviceAgreementId")
+            assert(signServiceAgreementResult.serviceAgreementSignature, "no serviceAgreementSignature")
+            assert(signServiceAgreementResult.serviceAgreementSignature.startsWith("0x"))
+            assert(signServiceAgreementResult.serviceAgreementSignature.length === 132)
         })
 
     })
diff --git a/test/ocean/ServiceAgreement.test.ts b/test/ocean/ServiceAgreement.test.ts
index e944a8f..a3aef06 100644
--- a/test/ocean/ServiceAgreement.test.ts
+++ b/test/ocean/ServiceAgreement.test.ts
@@ -1,16 +1,12 @@
 import {assert} from "chai"
 import ConfigProvider from "../../src/ConfigProvider"
-import DDOCondition from "../../src/ddo/Condition"
+import Condition from "../../src/ddo/Condition"
 import DDO from "../../src/ddo/DDO"
-import Event from "../../src/ddo/Event"
-import EventHandlers from "../../src/ddo/EventHandlers"
 import MetaData from "../../src/ddo/MetaData"
-import Parameter from "../../src/ddo/Parameter"
 import Service from "../../src/ddo/Service"
 import Account from "../../src/ocean/Account"
 import IdGenerator from "../../src/ocean/IdGenerator"
 import Ocean from "../../src/ocean/Ocean"
-import Condition from "../../src/ocean/ServiceAgreements/Condition"
 import ServiceAgreement from "../../src/ocean/ServiceAgreements/ServiceAgreement"
 import ServiceAgreementTemplate from "../../src/ocean/ServiceAgreements/ServiceAgreementTemplate"
 import Access from "../../src/ocean/ServiceAgreements/Templates/Access"
@@ -44,70 +40,13 @@ describe("ServiceAgreement", () => {
         const serviceAgreementTemplate: ServiceAgreementTemplate =
             new ServiceAgreementTemplate(new Access())
 
-        // get condition keys from template
-        const conditions: Condition[] = await serviceAgreementTemplate.getConditions()
-
-        // create ddo conditions out of the keys
-        const ddoConditions: DDOCondition[] = conditions
-            .map((condition: Condition, index): DDOCondition => {
-
-                const events: Event[] = [
-                    {
-                        name: "PaymentReleased",
-                        actorType: [
-                            "consumer",
-                        ],
-                        handlers: {
-                            moduleName: "serviceAgreement",
-                            functionName: "fulfillAgreement",
-                            version: "0.1",
-                        } as EventHandlers,
-                    } as Event,
-                ]
-
-                const mapParameterValueToName = (name) => {
-
-                    switch (name) {
-                        case "price":
-                            return metadata.base.price
-                        case "assetId":
-                            return "0x" + assetId
-                        case "documentKeyId":
-                            return "0x" + assetId
-
-                    }
-
-                    return null
-                }
-
-                const parameters: Parameter[] = condition.parameters
-                    .map((parameter: Parameter) => {
-                        return {
-                            name: parameter.name,
-                            type: parameter.type,
-                            value: mapParameterValueToName(parameter.name),
-                        } as Parameter
-                    })
-
-                return {
-                    contractName: condition.methodReflection.contractName,
-                    methodName: condition.methodReflection.methodName,
-                    timeout: condition.timeout,
-                    index,
-                    conditionKey: condition.condtionKey,
-                    parameters,
-                    events,
-                    dependencies: condition.dependencies,
-                    dependencyTimeoutFlags: condition.dependencyTimeoutFlags,
-                    isTerminalCondition: condition.isTerminalCondition,
-                } as DDOCondition
-            })
+        const conditions: Condition[] = await serviceAgreementTemplate.getConditions(metadata, assetId)
 
         accessService = {
             type: "Access",
             serviceDefinitionId: IdGenerator.generateId(),
             templateId: serviceAgreementTemplate.getId(),
-            conditions: ddoConditions,
+            conditions,
         } as Service
 
         metaDataService = {
@@ -121,7 +60,7 @@ describe("ServiceAgreement", () => {
 
             const did: string = `did:op:${assetId}`
             const ddo = new DDO({id: did, service: [accessService]})
-            const serviceAgreementId: string = IdGenerator.generateId()
+            const serviceAgreementId: string = IdGenerator.generatePrefixedId()
 
             // @ts-ignore
             WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
@@ -132,6 +71,7 @@ describe("ServiceAgreement", () => {
 
             assert(serviceAgreementSignature)
             assert(serviceAgreementSignature.startsWith("0x"))
+            assert(serviceAgreementSignature.length === 132)
         })
     })
 
@@ -140,7 +80,7 @@ describe("ServiceAgreement", () => {
 
             const did: string = `did:op:${assetId}`
             const ddo = new DDO({id: did, service: [accessService]})
-            const serviceAgreementId: string = IdGenerator.generateId()
+            const serviceAgreementId: string = IdGenerator.generatePrefixedId()
 
             // @ts-ignore
             WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
@@ -164,7 +104,7 @@ describe("ServiceAgreement", () => {
 
             const did: string = `did:op:${assetId}`
             const ddo = new DDO({id: did, service: [accessService]})
-            const serviceAgreementId: string = IdGenerator.generateId()
+            const serviceAgreementId: string = IdGenerator.generatePrefixedId()
 
             // @ts-ignore
             WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
@@ -183,12 +123,12 @@ describe("ServiceAgreement", () => {
         })
     })
 
-    describe("#buyAsset()", () => {
+    describe("#payAsset()", () => {
         it("should lock the payment in that service agreement", async () => {
 
             const did: string = `did:op:${assetId}`
             const ddo = new DDO({id: did, service: [accessService, metaDataService]})
-            const serviceAgreementId: string = IdGenerator.generateId()
+            const serviceAgreementId: string = IdGenerator.generatePrefixedId()
 
             // @ts-ignore
             WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
@@ -206,7 +146,7 @@ describe("ServiceAgreement", () => {
             // get funds
             await consumerAccount.requestTokens(metaDataService.metadata.base.price)
 
-            const paid: boolean = await serviceAgreement.buyAsset(assetId, metaDataService.metadata.base.price,
+            const paid: boolean = await serviceAgreement.payAsset(assetId, metaDataService.metadata.base.price,
                 consumerAccount)
             assert(paid)
         })
@@ -217,7 +157,7 @@ describe("ServiceAgreement", () => {
 
             const did: string = `did:op:${assetId}`
             const ddo = new DDO({id: did, service: [accessService]})
-            const serviceAgreementId: string = IdGenerator.generateId()
+            const serviceAgreementId: string = IdGenerator.generatePrefixedId()
 
             // @ts-ignore
             WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
@@ -234,12 +174,12 @@ describe("ServiceAgreement", () => {
             // get funds
             await consumerAccount.requestTokens(metaDataService.metadata.base.price)
 
-            const paid: boolean = await serviceAgreement.buyAsset(assetId, metaDataService.metadata.base.price,
+            const paid: boolean = await serviceAgreement.payAsset(assetId, metaDataService.metadata.base.price,
                 consumerAccount)
             assert(paid)
 
             // todo: use document id
-            const accessGranted: boolean = await serviceAgreement.grantAccess(assetId, assetId)
+            const accessGranted: boolean = await serviceAgreement.grantAccess(assetId, assetId, publisherAccount)
             assert(accessGranted)
         })
 
@@ -247,7 +187,7 @@ describe("ServiceAgreement", () => {
 
             const did: string = `did:op:${assetId}`
             const ddo = new DDO({id: did, service: [accessService]})
-            const serviceAgreementId: string = IdGenerator.generateId()
+            const serviceAgreementId: string = IdGenerator.generatePrefixedId()
 
             // @ts-ignore
             WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
@@ -262,7 +202,7 @@ describe("ServiceAgreement", () => {
             assert(serviceAgreement)
 
             // todo: use document id
-            const accessGranted: boolean = await serviceAgreement.grantAccess(assetId, assetId)
+            const accessGranted: boolean = await serviceAgreement.grantAccess(assetId, assetId, publisherAccount)
             assert(!accessGranted)
         })
     })
diff --git a/test/ocean/ServiceAgreementTemplate.test.ts b/test/ocean/ServiceAgreementTemplate.test.ts
index 2e906a4..8ea80f3 100644
--- a/test/ocean/ServiceAgreementTemplate.test.ts
+++ b/test/ocean/ServiceAgreementTemplate.test.ts
@@ -1,5 +1,6 @@
 import {assert} from "chai"
 import ConfigProvider from "../../src/ConfigProvider"
+import MetaData from "../../src/ddo/MetaData"
 import Account from "../../src/ocean/Account"
 import IdGenerator from "../../src/ocean/IdGenerator"
 import Ocean from "../../src/ocean/Ocean"
@@ -48,7 +49,7 @@ describe("ServiceAgreementTemplate", () => {
                 new ServiceAgreementTemplate(access)
             assert(serviceAgreementTemplate)
 
-            const conds = await serviceAgreementTemplate.getConditions()
+            const conds = await serviceAgreementTemplate.getConditions(new MetaData(), IdGenerator.generateId())
             assert(conds)
         })
     })
diff --git a/webpack.common.js b/webpack.common.js
index fc00627..46f5b59 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -5,17 +5,12 @@ const { paths } = require('./webpack.parts.js')
 module.exports = {
     entry: paths.entry,
     mode: 'none',
-    module: {
-        rules: [
-            { test: /\.tsx?$/, loader: "ts-loader" }
-        ]
-    },
     optimization: {
         minimize: true,
         noEmitOnErrors: true
     },
     resolve: {
-        extensions: ['.js','.ts'],
+        extensions: ['.js'],
         modules: ['node_modules'],
     },
 }
diff --git a/webpack.parts.js b/webpack.parts.js
index dc94126..796a5e0 100644
--- a/webpack.parts.js
+++ b/webpack.parts.js
@@ -9,7 +9,7 @@ const production = require('./webpack.production.js')
 const AddVendorsPlugin = require('./plugins/add-vendors-plugin')
 
 const paths = {
-    entry: path.resolve(__dirname, './src/squid.ts'),
+    entry: path.resolve(__dirname, './dist/node/squid.js'),
     bundle: path.resolve(__dirname, 'dist/browser'),
 }