diff --git a/README.md b/README.md
index e99e9f2..50c8d8a 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ The following resources need attention:
 | `STORAGE_CLASS`                                        | Storage class to use (see next section).                                                    |
 | `NOTIFY_START_URL`                                     | URL to call when a new job starts.                                                          |
 | `NOTIFY_STOP_URL`                                      | URL to call when a new job ends.                                                            |
-| `SERVICE_ACCOUNT`                                      | K8 service account to run pods (same as the one used in deployment). Defaults to db-operator|
+| `SERVICE_ACCOUNT`                                      | K8 service account to run pods. Defaults to 'default'                                       |
 | `NODE_SELECTOR`                                        | K8 node selector (if defined)                                                               |
 | `PULL_SECRET`                                          | ImagesPullSecret (if defined) (see https://kubernetes.io/docs/concepts/containers/images/#referring-to-an-imagepullsecrets-on-a-pod)|
 | `PULL_POLICY`                                          | imagePullPolicy (if defined) (see https://kubernetes.io/docs/concepts/configuration/overview/#container-images)|
diff --git a/artifacts/AccessSecretStoreCondition.duero.json b/artifacts/AccessSecretStoreCondition.duero.json
deleted file mode 100644
index 483d0f9..0000000
--- a/artifacts/AccessSecretStoreCondition.duero.json
+++ /dev/null
@@ -1,266 +0,0 @@
-{
-  "name": "AccessSecretStoreCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_documentId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_grantee",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_conditionId",
-          "type": "bytes32"
-        }
-      ],
-      "name": "Fulfilled",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_agreementStoreManagerAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc0c53b8b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_documentId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_grantee",
-          "type": "address"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xeea0a725"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_documentId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_grantee",
-          "type": "address"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xd9250da4"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_grantee",
-          "type": "address"
-        },
-        {
-          "name": "_documentId",
-          "type": "bytes32"
-        }
-      ],
-      "name": "checkPermissions",
-      "outputs": [
-        {
-          "name": "permissionGranted",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xb36a9a7c"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610be5806100206000396000f3fe608060405234801561001057600080fd5b50600436106100c6576000357c010000000000000000000000000000000000000000000000000000000090048063c0c53b8b1161008e578063c0c53b8b14610182578063c4d66de8146101ba578063cb4e57e8146101e0578063d9250da414610215578063eea0a72514610247578063f2fde38b14610273576100c6565b80631ce19185146100cb578063715018a61461010c5780638da5cb5b146101165780638f32d59b1461013a578063b36a9a7c14610156575b600080fd5b6100e8600480360360208110156100e157600080fd5b5035610299565b604051808260038111156100f857fe5b60ff16815260200191505060405180910390f35b61011461041e565b005b61011e610486565b60408051600160a060020a039092168252519081900360200190f35b610142610495565b604080519115158252519081900360200190f35b6101426004803603604081101561016c57600080fd5b50600160a060020a0381351690602001356104a6565b6101146004803603606081101561019857600080fd5b50600160a060020a038135811691602081013582169160409091013516610591565b610114600480360360208110156101d057600080fd5b5035600160a060020a031661067f565b610203600480360360408110156101f657600080fd5b5080359060200135610781565b60408051918252519081900360200190f35b6100e86004803603606081101561022b57600080fd5b5080359060208101359060400135600160a060020a03166107c2565b6102036004803603604081101561025d57600080fd5b5080359060200135600160a060020a03166109f7565b6101146004803603602081101561028957600080fd5b5035600160a060020a0316610a3c565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b1580156102fe57600080fd5b505afa158015610312573d6000803e3d6000fd5b505050506040513d602081101561032857600080fd5b505161037e576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b1580156103ec57600080fd5b505af1158015610400573d6000803e3d6000fd5b505050506040513d602081101561041657600080fd5b505192915050565b610426610495565b61042f57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b60685460008281526067602090815260408083205481517fcaf92b8b0000000000000000000000000000000000000000000000000000000081526004810191909152600160a060020a03878116602483015291519394859492169263caf92b8b92604480840193829003018186803b15801561052157600080fd5b505afa158015610535573d6000803e3d6000fd5b505050506040513d602081101561054b57600080fd5b50519050801561055f57600191505061058b565b50506000818152606760209081526040808320600160a060020a038616845260010190915290205460ff165b92915050565b600054610100900460ff16806105aa57506105aa610a59565b806105b8575060005460ff16155b6105f65760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610b8c602e913960400191505060405180910390fd5b600054610100900460ff16158015610621576000805460ff1961ff0019909116610100171660011790555b61062a8461067f565b60668054600160a060020a0380861673ffffffffffffffffffffffffffffffffffffffff199283161790925560688054928516929091169190911790558015610679576000805461ff00191690555b50505050565b600054610100900460ff16806106985750610698610a59565b806106a6575060005460ff16155b6106e45760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610b8c602e913960400191505060405180910390fd5b600054610100900460ff1615801561070f576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a3801561077d576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b606854604080517fd1c1db39000000000000000000000000000000000000000000000000000000008152600481018690523360248201529051600092600160a060020a03169163d1c1db39916044808301926020929190829003018186803b15801561082d57600080fd5b505afa158015610841573d6000803e3d6000fd5b505050506040513d602081101561085757600080fd5b5051806108f75750606854604080517fcaf92b8b000000000000000000000000000000000000000000000000000000008152600481018790523360248201529051600160a060020a039092169163caf92b8b91604480820192602092909190829003018186803b1580156108ca57600080fd5b505afa1580156108de573d6000803e3d6000fd5b505050506040513d60208110156108f457600080fd5b50515b61094b576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420557064617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b6000838152606760208181526040808420600160a060020a038716855260018181018452918520805460ff191690921790915586845291905285905561099a8561099586866109f7565b610781565b905060006109a9826002610a5f565b905083600160a060020a031685877f6855f7a98b24193f81092c1736cdb5bd7e647de52ca83d767d735c3735ddb2d2856040518082815260200191505060405180910390a495945050505050565b60408051602080820194909452600160a060020a03929092166c0100000000000000000000000002828201528051808303603401815260549092019052805191012090565b610a44610495565b610a4d57600080fd5b610a5681610b0f565b50565b303b1590565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e46918691869190602401826003811115610ab657fe5b60ff16815260200192505050602060405180830381600087803b158015610adc57600080fd5b505af1158015610af0573d6000803e3d6000fd5b505050506040513d6020811015610b0657600080fd5b50519392505050565b600160a060020a038116610b2257600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820de409cb18ed5a5b899a8c46eb191b1d21bd4e05f7a1383efb2006f7197e1016f0029",
-  "address": "0x99FFC24B6749512F6DE6D24c5dBCC390359af4E3",
-  "implementation": "0x205259A26d773636606ad668e3E2C3FC0C8268f0",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/AccessSecretStoreCondition.kovan.json b/artifacts/AccessSecretStoreCondition.kovan.json
deleted file mode 100644
index 7662807..0000000
--- a/artifacts/AccessSecretStoreCondition.kovan.json
+++ /dev/null
@@ -1,266 +0,0 @@
-{
-  "name": "AccessSecretStoreCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_documentId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_grantee",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_conditionId",
-          "type": "bytes32"
-        }
-      ],
-      "name": "Fulfilled",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_agreementStoreManagerAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc0c53b8b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_documentId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_grantee",
-          "type": "address"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xeea0a725"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_documentId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_grantee",
-          "type": "address"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xd9250da4"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_grantee",
-          "type": "address"
-        },
-        {
-          "name": "_documentId",
-          "type": "bytes32"
-        }
-      ],
-      "name": "checkPermissions",
-      "outputs": [
-        {
-          "name": "permissionGranted",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xb36a9a7c"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610be5806100206000396000f3fe608060405234801561001057600080fd5b50600436106100c6576000357c010000000000000000000000000000000000000000000000000000000090048063c0c53b8b1161008e578063c0c53b8b14610182578063c4d66de8146101ba578063cb4e57e8146101e0578063d9250da414610215578063eea0a72514610247578063f2fde38b14610273576100c6565b80631ce19185146100cb578063715018a61461010c5780638da5cb5b146101165780638f32d59b1461013a578063b36a9a7c14610156575b600080fd5b6100e8600480360360208110156100e157600080fd5b5035610299565b604051808260038111156100f857fe5b60ff16815260200191505060405180910390f35b61011461041e565b005b61011e610486565b60408051600160a060020a039092168252519081900360200190f35b610142610495565b604080519115158252519081900360200190f35b6101426004803603604081101561016c57600080fd5b50600160a060020a0381351690602001356104a6565b6101146004803603606081101561019857600080fd5b50600160a060020a038135811691602081013582169160409091013516610591565b610114600480360360208110156101d057600080fd5b5035600160a060020a031661067f565b610203600480360360408110156101f657600080fd5b5080359060200135610781565b60408051918252519081900360200190f35b6100e86004803603606081101561022b57600080fd5b5080359060208101359060400135600160a060020a03166107c2565b6102036004803603604081101561025d57600080fd5b5080359060200135600160a060020a03166109f7565b6101146004803603602081101561028957600080fd5b5035600160a060020a0316610a3c565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b1580156102fe57600080fd5b505afa158015610312573d6000803e3d6000fd5b505050506040513d602081101561032857600080fd5b505161037e576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b1580156103ec57600080fd5b505af1158015610400573d6000803e3d6000fd5b505050506040513d602081101561041657600080fd5b505192915050565b610426610495565b61042f57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b60685460008281526067602090815260408083205481517fcaf92b8b0000000000000000000000000000000000000000000000000000000081526004810191909152600160a060020a03878116602483015291519394859492169263caf92b8b92604480840193829003018186803b15801561052157600080fd5b505afa158015610535573d6000803e3d6000fd5b505050506040513d602081101561054b57600080fd5b50519050801561055f57600191505061058b565b50506000818152606760209081526040808320600160a060020a038616845260010190915290205460ff165b92915050565b600054610100900460ff16806105aa57506105aa610a59565b806105b8575060005460ff16155b6105f65760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610b8c602e913960400191505060405180910390fd5b600054610100900460ff16158015610621576000805460ff1961ff0019909116610100171660011790555b61062a8461067f565b60668054600160a060020a0380861673ffffffffffffffffffffffffffffffffffffffff199283161790925560688054928516929091169190911790558015610679576000805461ff00191690555b50505050565b600054610100900460ff16806106985750610698610a59565b806106a6575060005460ff16155b6106e45760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610b8c602e913960400191505060405180910390fd5b600054610100900460ff1615801561070f576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a3801561077d576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b606854604080517fd1c1db39000000000000000000000000000000000000000000000000000000008152600481018690523360248201529051600092600160a060020a03169163d1c1db39916044808301926020929190829003018186803b15801561082d57600080fd5b505afa158015610841573d6000803e3d6000fd5b505050506040513d602081101561085757600080fd5b5051806108f75750606854604080517fcaf92b8b000000000000000000000000000000000000000000000000000000008152600481018790523360248201529051600160a060020a039092169163caf92b8b91604480820192602092909190829003018186803b1580156108ca57600080fd5b505afa1580156108de573d6000803e3d6000fd5b505050506040513d60208110156108f457600080fd5b50515b61094b576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420557064617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b6000838152606760208181526040808420600160a060020a038716855260018181018452918520805460ff191690921790915586845291905285905561099a8561099586866109f7565b610781565b905060006109a9826002610a5f565b905083600160a060020a031685877f6855f7a98b24193f81092c1736cdb5bd7e647de52ca83d767d735c3735ddb2d2856040518082815260200191505060405180910390a495945050505050565b60408051602080820194909452600160a060020a03929092166c0100000000000000000000000002828201528051808303603401815260549092019052805191012090565b610a44610495565b610a4d57600080fd5b610a5681610b0f565b50565b303b1590565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e46918691869190602401826003811115610ab657fe5b60ff16815260200192505050602060405180830381600087803b158015610adc57600080fd5b505af1158015610af0573d6000803e3d6000fd5b505050506040513d6020811015610b0657600080fd5b50519392505050565b600160a060020a038116610b2257600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820de409cb18ed5a5b899a8c46eb191b1d21bd4e05f7a1383efb2006f7197e1016f0029",
-  "address": "0x9Ee06Ac392FE11f1933a51B48D1d07dd97f1dec7",
-  "implementation": "0x3C9e58648B46B036e29426A8B3eC83A2D2aCA956",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/AccessSecretStoreCondition.mainnet.json b/artifacts/AccessSecretStoreCondition.mainnet.json
deleted file mode 100644
index cf5b532..0000000
--- a/artifacts/AccessSecretStoreCondition.mainnet.json
+++ /dev/null
@@ -1,266 +0,0 @@
-{
-  "name": "AccessSecretStoreCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_documentId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_grantee",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_conditionId",
-          "type": "bytes32"
-        }
-      ],
-      "name": "Fulfilled",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_agreementStoreManagerAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc0c53b8b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_documentId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_grantee",
-          "type": "address"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xeea0a725"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_documentId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_grantee",
-          "type": "address"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xd9250da4"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_grantee",
-          "type": "address"
-        },
-        {
-          "name": "_documentId",
-          "type": "bytes32"
-        }
-      ],
-      "name": "checkPermissions",
-      "outputs": [
-        {
-          "name": "permissionGranted",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xb36a9a7c"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610be5806100206000396000f3fe608060405234801561001057600080fd5b50600436106100c6576000357c010000000000000000000000000000000000000000000000000000000090048063c0c53b8b1161008e578063c0c53b8b14610182578063c4d66de8146101ba578063cb4e57e8146101e0578063d9250da414610215578063eea0a72514610247578063f2fde38b14610273576100c6565b80631ce19185146100cb578063715018a61461010c5780638da5cb5b146101165780638f32d59b1461013a578063b36a9a7c14610156575b600080fd5b6100e8600480360360208110156100e157600080fd5b5035610299565b604051808260038111156100f857fe5b60ff16815260200191505060405180910390f35b61011461041e565b005b61011e610486565b60408051600160a060020a039092168252519081900360200190f35b610142610495565b604080519115158252519081900360200190f35b6101426004803603604081101561016c57600080fd5b50600160a060020a0381351690602001356104a6565b6101146004803603606081101561019857600080fd5b50600160a060020a038135811691602081013582169160409091013516610591565b610114600480360360208110156101d057600080fd5b5035600160a060020a031661067f565b610203600480360360408110156101f657600080fd5b5080359060200135610781565b60408051918252519081900360200190f35b6100e86004803603606081101561022b57600080fd5b5080359060208101359060400135600160a060020a03166107c2565b6102036004803603604081101561025d57600080fd5b5080359060200135600160a060020a03166109f7565b6101146004803603602081101561028957600080fd5b5035600160a060020a0316610a3c565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b1580156102fe57600080fd5b505afa158015610312573d6000803e3d6000fd5b505050506040513d602081101561032857600080fd5b505161037e576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b1580156103ec57600080fd5b505af1158015610400573d6000803e3d6000fd5b505050506040513d602081101561041657600080fd5b505192915050565b610426610495565b61042f57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b60685460008281526067602090815260408083205481517fcaf92b8b0000000000000000000000000000000000000000000000000000000081526004810191909152600160a060020a03878116602483015291519394859492169263caf92b8b92604480840193829003018186803b15801561052157600080fd5b505afa158015610535573d6000803e3d6000fd5b505050506040513d602081101561054b57600080fd5b50519050801561055f57600191505061058b565b50506000818152606760209081526040808320600160a060020a038616845260010190915290205460ff165b92915050565b600054610100900460ff16806105aa57506105aa610a59565b806105b8575060005460ff16155b6105f65760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610b8c602e913960400191505060405180910390fd5b600054610100900460ff16158015610621576000805460ff1961ff0019909116610100171660011790555b61062a8461067f565b60668054600160a060020a0380861673ffffffffffffffffffffffffffffffffffffffff199283161790925560688054928516929091169190911790558015610679576000805461ff00191690555b50505050565b600054610100900460ff16806106985750610698610a59565b806106a6575060005460ff16155b6106e45760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610b8c602e913960400191505060405180910390fd5b600054610100900460ff1615801561070f576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a3801561077d576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b606854604080517fd1c1db39000000000000000000000000000000000000000000000000000000008152600481018690523360248201529051600092600160a060020a03169163d1c1db39916044808301926020929190829003018186803b15801561082d57600080fd5b505afa158015610841573d6000803e3d6000fd5b505050506040513d602081101561085757600080fd5b5051806108f75750606854604080517fcaf92b8b000000000000000000000000000000000000000000000000000000008152600481018790523360248201529051600160a060020a039092169163caf92b8b91604480820192602092909190829003018186803b1580156108ca57600080fd5b505afa1580156108de573d6000803e3d6000fd5b505050506040513d60208110156108f457600080fd5b50515b61094b576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420557064617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b6000838152606760208181526040808420600160a060020a038716855260018181018452918520805460ff191690921790915586845291905285905561099a8561099586866109f7565b610781565b905060006109a9826002610a5f565b905083600160a060020a031685877f6855f7a98b24193f81092c1736cdb5bd7e647de52ca83d767d735c3735ddb2d2856040518082815260200191505060405180910390a495945050505050565b60408051602080820194909452600160a060020a03929092166c0100000000000000000000000002828201528051808303603401815260549092019052805191012090565b610a44610495565b610a4d57600080fd5b610a5681610b0f565b50565b303b1590565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e46918691869190602401826003811115610ab657fe5b60ff16815260200192505050602060405180830381600087803b158015610adc57600080fd5b505af1158015610af0573d6000803e3d6000fd5b505050506040513d6020811015610b0657600080fd5b50519392505050565b600160a060020a038116610b2257600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820de409cb18ed5a5b899a8c46eb191b1d21bd4e05f7a1383efb2006f7197e1016f0029",
-  "address": "0x57e299517B6E5637cE9da15E4372f42a63c7e099",
-  "implementation": "0x830304a612D1cC6d5D5356Ee0Da0916107Ff3feC",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/AccessSecretStoreCondition.nile.json b/artifacts/AccessSecretStoreCondition.nile.json
deleted file mode 100644
index 8a3c0a4..0000000
--- a/artifacts/AccessSecretStoreCondition.nile.json
+++ /dev/null
@@ -1,266 +0,0 @@
-{
-  "name": "AccessSecretStoreCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_documentId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_grantee",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_conditionId",
-          "type": "bytes32"
-        }
-      ],
-      "name": "Fulfilled",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_agreementStoreManagerAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc0c53b8b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_documentId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_grantee",
-          "type": "address"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xeea0a725"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_documentId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_grantee",
-          "type": "address"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xd9250da4"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_grantee",
-          "type": "address"
-        },
-        {
-          "name": "_documentId",
-          "type": "bytes32"
-        }
-      ],
-      "name": "checkPermissions",
-      "outputs": [
-        {
-          "name": "permissionGranted",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xb36a9a7c"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610be5806100206000396000f3fe608060405234801561001057600080fd5b50600436106100c6576000357c010000000000000000000000000000000000000000000000000000000090048063c0c53b8b1161008e578063c0c53b8b14610182578063c4d66de8146101ba578063cb4e57e8146101e0578063d9250da414610215578063eea0a72514610247578063f2fde38b14610273576100c6565b80631ce19185146100cb578063715018a61461010c5780638da5cb5b146101165780638f32d59b1461013a578063b36a9a7c14610156575b600080fd5b6100e8600480360360208110156100e157600080fd5b5035610299565b604051808260038111156100f857fe5b60ff16815260200191505060405180910390f35b61011461041e565b005b61011e610486565b60408051600160a060020a039092168252519081900360200190f35b610142610495565b604080519115158252519081900360200190f35b6101426004803603604081101561016c57600080fd5b50600160a060020a0381351690602001356104a6565b6101146004803603606081101561019857600080fd5b50600160a060020a038135811691602081013582169160409091013516610591565b610114600480360360208110156101d057600080fd5b5035600160a060020a031661067f565b610203600480360360408110156101f657600080fd5b5080359060200135610781565b60408051918252519081900360200190f35b6100e86004803603606081101561022b57600080fd5b5080359060208101359060400135600160a060020a03166107c2565b6102036004803603604081101561025d57600080fd5b5080359060200135600160a060020a03166109f7565b6101146004803603602081101561028957600080fd5b5035600160a060020a0316610a3c565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b1580156102fe57600080fd5b505afa158015610312573d6000803e3d6000fd5b505050506040513d602081101561032857600080fd5b505161037e576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b1580156103ec57600080fd5b505af1158015610400573d6000803e3d6000fd5b505050506040513d602081101561041657600080fd5b505192915050565b610426610495565b61042f57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b60685460008281526067602090815260408083205481517fcaf92b8b0000000000000000000000000000000000000000000000000000000081526004810191909152600160a060020a03878116602483015291519394859492169263caf92b8b92604480840193829003018186803b15801561052157600080fd5b505afa158015610535573d6000803e3d6000fd5b505050506040513d602081101561054b57600080fd5b50519050801561055f57600191505061058b565b50506000818152606760209081526040808320600160a060020a038616845260010190915290205460ff165b92915050565b600054610100900460ff16806105aa57506105aa610a59565b806105b8575060005460ff16155b6105f65760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610b8c602e913960400191505060405180910390fd5b600054610100900460ff16158015610621576000805460ff1961ff0019909116610100171660011790555b61062a8461067f565b60668054600160a060020a0380861673ffffffffffffffffffffffffffffffffffffffff199283161790925560688054928516929091169190911790558015610679576000805461ff00191690555b50505050565b600054610100900460ff16806106985750610698610a59565b806106a6575060005460ff16155b6106e45760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610b8c602e913960400191505060405180910390fd5b600054610100900460ff1615801561070f576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a3801561077d576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b606854604080517fd1c1db39000000000000000000000000000000000000000000000000000000008152600481018690523360248201529051600092600160a060020a03169163d1c1db39916044808301926020929190829003018186803b15801561082d57600080fd5b505afa158015610841573d6000803e3d6000fd5b505050506040513d602081101561085757600080fd5b5051806108f75750606854604080517fcaf92b8b000000000000000000000000000000000000000000000000000000008152600481018790523360248201529051600160a060020a039092169163caf92b8b91604480820192602092909190829003018186803b1580156108ca57600080fd5b505afa1580156108de573d6000803e3d6000fd5b505050506040513d60208110156108f457600080fd5b50515b61094b576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420557064617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b6000838152606760208181526040808420600160a060020a038716855260018181018452918520805460ff191690921790915586845291905285905561099a8561099586866109f7565b610781565b905060006109a9826002610a5f565b905083600160a060020a031685877f6855f7a98b24193f81092c1736cdb5bd7e647de52ca83d767d735c3735ddb2d2856040518082815260200191505060405180910390a495945050505050565b60408051602080820194909452600160a060020a03929092166c0100000000000000000000000002828201528051808303603401815260549092019052805191012090565b610a44610495565b610a4d57600080fd5b610a5681610b0f565b50565b303b1590565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e46918691869190602401826003811115610ab657fe5b60ff16815260200192505050602060405180830381600087803b158015610adc57600080fd5b505af1158015610af0573d6000803e3d6000fd5b505050506040513d6020811015610b0657600080fd5b50519392505050565b600160a060020a038116610b2257600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820de409cb18ed5a5b899a8c46eb191b1d21bd4e05f7a1383efb2006f7197e1016f0029",
-  "address": "0x45DE141F8Efc355F1451a102FB6225F1EDd2921d",
-  "implementation": "0x084Aa6E85FC375dA268185B374aDE46c558c0865",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/AccessSecretStoreCondition.pacific.json b/artifacts/AccessSecretStoreCondition.pacific.json
deleted file mode 100644
index b29a5f8..0000000
--- a/artifacts/AccessSecretStoreCondition.pacific.json
+++ /dev/null
@@ -1,266 +0,0 @@
-{
-  "name": "AccessSecretStoreCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_documentId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_grantee",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_conditionId",
-          "type": "bytes32"
-        }
-      ],
-      "name": "Fulfilled",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_agreementStoreManagerAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc0c53b8b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_documentId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_grantee",
-          "type": "address"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xeea0a725"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_documentId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_grantee",
-          "type": "address"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xd9250da4"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_grantee",
-          "type": "address"
-        },
-        {
-          "name": "_documentId",
-          "type": "bytes32"
-        }
-      ],
-      "name": "checkPermissions",
-      "outputs": [
-        {
-          "name": "permissionGranted",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xb36a9a7c"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610be5806100206000396000f3fe608060405234801561001057600080fd5b50600436106100c6576000357c010000000000000000000000000000000000000000000000000000000090048063c0c53b8b1161008e578063c0c53b8b14610182578063c4d66de8146101ba578063cb4e57e8146101e0578063d9250da414610215578063eea0a72514610247578063f2fde38b14610273576100c6565b80631ce19185146100cb578063715018a61461010c5780638da5cb5b146101165780638f32d59b1461013a578063b36a9a7c14610156575b600080fd5b6100e8600480360360208110156100e157600080fd5b5035610299565b604051808260038111156100f857fe5b60ff16815260200191505060405180910390f35b61011461041e565b005b61011e610486565b60408051600160a060020a039092168252519081900360200190f35b610142610495565b604080519115158252519081900360200190f35b6101426004803603604081101561016c57600080fd5b50600160a060020a0381351690602001356104a6565b6101146004803603606081101561019857600080fd5b50600160a060020a038135811691602081013582169160409091013516610591565b610114600480360360208110156101d057600080fd5b5035600160a060020a031661067f565b610203600480360360408110156101f657600080fd5b5080359060200135610781565b60408051918252519081900360200190f35b6100e86004803603606081101561022b57600080fd5b5080359060208101359060400135600160a060020a03166107c2565b6102036004803603604081101561025d57600080fd5b5080359060200135600160a060020a03166109f7565b6101146004803603602081101561028957600080fd5b5035600160a060020a0316610a3c565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b1580156102fe57600080fd5b505afa158015610312573d6000803e3d6000fd5b505050506040513d602081101561032857600080fd5b505161037e576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b1580156103ec57600080fd5b505af1158015610400573d6000803e3d6000fd5b505050506040513d602081101561041657600080fd5b505192915050565b610426610495565b61042f57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b60685460008281526067602090815260408083205481517fcaf92b8b0000000000000000000000000000000000000000000000000000000081526004810191909152600160a060020a03878116602483015291519394859492169263caf92b8b92604480840193829003018186803b15801561052157600080fd5b505afa158015610535573d6000803e3d6000fd5b505050506040513d602081101561054b57600080fd5b50519050801561055f57600191505061058b565b50506000818152606760209081526040808320600160a060020a038616845260010190915290205460ff165b92915050565b600054610100900460ff16806105aa57506105aa610a59565b806105b8575060005460ff16155b6105f65760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610b8c602e913960400191505060405180910390fd5b600054610100900460ff16158015610621576000805460ff1961ff0019909116610100171660011790555b61062a8461067f565b60668054600160a060020a0380861673ffffffffffffffffffffffffffffffffffffffff199283161790925560688054928516929091169190911790558015610679576000805461ff00191690555b50505050565b600054610100900460ff16806106985750610698610a59565b806106a6575060005460ff16155b6106e45760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610b8c602e913960400191505060405180910390fd5b600054610100900460ff1615801561070f576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a3801561077d576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b606854604080517fd1c1db39000000000000000000000000000000000000000000000000000000008152600481018690523360248201529051600092600160a060020a03169163d1c1db39916044808301926020929190829003018186803b15801561082d57600080fd5b505afa158015610841573d6000803e3d6000fd5b505050506040513d602081101561085757600080fd5b5051806108f75750606854604080517fcaf92b8b000000000000000000000000000000000000000000000000000000008152600481018790523360248201529051600160a060020a039092169163caf92b8b91604480820192602092909190829003018186803b1580156108ca57600080fd5b505afa1580156108de573d6000803e3d6000fd5b505050506040513d60208110156108f457600080fd5b50515b61094b576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420557064617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b6000838152606760208181526040808420600160a060020a038716855260018181018452918520805460ff191690921790915586845291905285905561099a8561099586866109f7565b610781565b905060006109a9826002610a5f565b905083600160a060020a031685877f6855f7a98b24193f81092c1736cdb5bd7e647de52ca83d767d735c3735ddb2d2856040518082815260200191505060405180910390a495945050505050565b60408051602080820194909452600160a060020a03929092166c0100000000000000000000000002828201528051808303603401815260549092019052805191012090565b610a44610495565b610a4d57600080fd5b610a5681610b0f565b50565b303b1590565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e46918691869190602401826003811115610ab657fe5b60ff16815260200192505050602060405180830381600087803b158015610adc57600080fd5b505af1158015610af0573d6000803e3d6000fd5b505050506040513d6020811015610b0657600080fd5b50519392505050565b600160a060020a038116610b2257600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820de409cb18ed5a5b899a8c46eb191b1d21bd4e05f7a1383efb2006f7197e1016f0029",
-  "address": "0x7FC6520Af3F0800d76A3e2FfE7b838c945ADBFE4",
-  "implementation": "0x9B4f4314FBC52D9092C27F6bD90a07f0f715430c",
-  "version": "v0.10.3"
-}
\ No newline at end of file
diff --git a/artifacts/AgreementStoreManager.duero.json b/artifacts/AgreementStoreManager.duero.json
deleted file mode 100644
index 0b17465..0000000
--- a/artifacts/AgreementStoreManager.duero.json
+++ /dev/null
@@ -1,326 +0,0 @@
-{
-  "name": "AgreementStoreManager",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_templateStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_didRegistryAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf8c8765e"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_conditionTypes",
-          "type": "address[]"
-        },
-        {
-          "name": "_conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        }
-      ],
-      "name": "createAgreement",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x955d0c2a"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreement",
-      "outputs": [
-        {
-          "name": "did",
-          "type": "bytes32"
-        },
-        {
-          "name": "didOwner",
-          "type": "address"
-        },
-        {
-          "name": "templateId",
-          "type": "address"
-        },
-        {
-          "name": "conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xf42eb765"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreementDIDOwner",
-      "outputs": [
-        {
-          "name": "didOwner",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x17cfbf5e"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "isAgreementDIDOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xd1c1db39"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "isAgreementDIDProvider",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcaf92b8b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getAgreementListSize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8a9013cb"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreementIdsForDID",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8945226e"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_templateId",
-          "type": "address"
-        }
-      ],
-      "name": "getAgreementIdsForTemplateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xa340c34f"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506113cb806100206000396000f3fe608060405234801561001057600080fd5b5060043610610107576000357c010000000000000000000000000000000000000000000000000000000090048063a340c34f116100a9578063d1c1db3911610083578063d1c1db39146104ad578063f2fde38b146104d9578063f42eb765146104ff578063f8c8765e146105c957610107565b8063a340c34f14610435578063c4d66de81461045b578063caf92b8b1461048157610107565b80638a9013cb116100e55780638a9013cb146101bc5780638da5cb5b146101d65780638f32d59b146101de578063955d0c2a146101fa57610107565b806317cfbf5e1461010c578063715018a6146101455780638945226e1461014f575b600080fd5b6101296004803603602081101561012257600080fd5b5035610607565b60408051600160a060020a039092168252519081900360200190f35b61014d6106ac565b005b61016c6004803603602081101561016557600080fd5b5035610714565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156101a8578181015183820152602001610190565b505050509050019250505060405180910390f35b6101c4610776565b60408051918252519081900360200190f35b61012961077d565b6101e661078c565b604080519115158252519081900360200190f35b6101c4600480360360c081101561021057600080fd5b81359160208101359181019060608101604082013564010000000081111561023757600080fd5b82018360208201111561024957600080fd5b8035906020019184602083028401116401000000008311171561026b57600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156102bb57600080fd5b8201836020820111156102cd57600080fd5b803590602001918460208302840111640100000000831117156102ef57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561033f57600080fd5b82018360208201111561035157600080fd5b8035906020019184602083028401116401000000008311171561037357600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156103c357600080fd5b8201836020820111156103d557600080fd5b803590602001918460208302840111640100000000831117156103f757600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092955061079d945050505050565b61016c6004803603602081101561044b57600080fd5b5035600160a060020a0316610b28565b61014d6004803603602081101561047157600080fd5b5035600160a060020a0316610b92565b6101e66004803603604081101561049757600080fd5b5080359060200135600160a060020a0316610c94565b6101e6600480360360408110156104c357600080fd5b5080359060200135600160a060020a0316610d42565b61014d600480360360208110156104ef57600080fd5b5035600160a060020a0316610df7565b61051c6004803603602081101561051557600080fd5b5035610e14565b6040518087815260200186600160a060020a0316600160a060020a0316815260200185600160a060020a0316600160a060020a031681526020018060200184600160a060020a0316600160a060020a03168152602001838152602001828103825285818151815260200191508051906020019060200280838360005b838110156105b0578181015183820152602001610598565b5050505090500197505050505050505060405180910390f35b61014d600480360360808110156105df57600080fd5b50600160a060020a038135811691602081013582169160408201358116916060013516610f65565b600081815260666020908152604080832054606c5482517f6c2ef5240000000000000000000000000000000000000000000000000000000081526004810183905292519193600160a060020a0390911692636c2ef5249260248083019392829003018186803b15801561067957600080fd5b505afa15801561068d573d6000803e3d6000fd5b505050506040513d60208110156106a357600080fd5b50519392505050565b6106b461078c565b6106bd57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b60008181526067602090815260409182902080548351818402810184019094528084526060939283018282801561076a57602002820191906000526020600020905b815481526020019060010190808311610756575b50505050509050919050565b6069545b90565b603354600160a060020a031690565b603354600160a060020a0316331490565b606b54604080517fb727a2550000000000000000000000000000000000000000000000000000000081523360048201529051600092600160a060020a03169163b727a255916024808301926020929190829003018186803b15801561080157600080fd5b505afa158015610815573d6000803e3d6000fd5b505050506040513d602081101561082b57600080fd5b50511515600114610886576040805160e560020a62461bcd02815260206004820152601560248201527f54656d706c617465206e6f7420417070726f7665640000000000000000000000604482015290519081900360640190fd5b606c54604080517fbbc1dede000000000000000000000000000000000000000000000000000000008152600481018990529051600092600160a060020a03169163bbc1dede916024808301926020929190829003018186803b1580156108eb57600080fd5b505afa1580156108ff573d6000803e3d6000fd5b505050506040513d602081101561091557600080fd5b50511161096c576040805160e560020a62461bcd02815260206004820152601260248201527f444944206e6f7420726567697374657265640000000000000000000000000000604482015290519081900360640190fd5b8451845114801561097e575084518351145b801561098b575084518251145b6109df576040805160e560020a62461bcd02815260206004820152601b60248201527f417267756d656e747320686176652077726f6e67206c656e6774680000000000604482015290519081900360640190fd5b60005b8551811015610aff57606a548551600160a060020a039091169063fe3ae90f90879084908110610a0e57fe5b6020026020010151888481518110610a2257fe5b6020026020010151878581518110610a3657fe5b6020026020010151878681518110610a4a57fe5b60200260200101516040518563ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018085815260200184600160a060020a0316600160a060020a03168152602001838152602001828152602001945050505050602060405180830381600087803b158015610acb57600080fd5b505af1158015610adf573d6000803e3d6000fd5b505050506040513d6020811015610af557600080fd5b50506001016109e2565b50610b1460668888338863ffffffff6110fd16565b50610b1d610776565b979650505050505050565b600160a060020a03811660009081526068602090815260409182902080548351818402810184019094528084526060939283018282801561076a57602002820191906000526020600020908154815260200190600101908083116107565750505050509050919050565b600054610100900460ff1680610bab5750610bab61128a565b80610bb9575060005460ff16155b610bf75760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611372602e913960400191505060405180910390fd5b600054610100900460ff16158015610c22576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610c90576000805461ff00191690555b5050565b600082815260666020908152604080832054606c5482517f3c6aa7b700000000000000000000000000000000000000000000000000000000815260048101839052600160a060020a038781166024830152935192949390911692633c6aa7b792604480840193829003018186803b158015610d0e57600080fd5b505afa158015610d22573d6000803e3d6000fd5b505050506040513d6020811015610d3857600080fd5b5051949350505050565b600082815260666020908152604080832054606c5482517f6c2ef5240000000000000000000000000000000000000000000000000000000081526004810183905292519193600160a060020a0390911692636c2ef5249260248083019392829003018186803b158015610db457600080fd5b505afa158015610dc8573d6000803e3d6000fd5b505050506040513d6020811015610dde57600080fd5b5051600160a060020a0384811691161491505092915050565b610dff61078c565b610e0857600080fd5b610e1181611290565b50565b600081815260666020908152604080832054606c5482517f6c2ef524000000000000000000000000000000000000000000000000000000008152600481018390529251919493849360609385938493600160a060020a0390911692636c2ef5249260248083019392829003018186803b158015610e9057600080fd5b505afa158015610ea4573d6000803e3d6000fd5b505050506040513d6020811015610eba57600080fd5b5051600088815260666020908152604091829020600181015460029091018054845181850281018501909552808552949950600160a060020a039091169750919290830182828015610f2b57602002820191906000526020600020905b815481526020019060010190808311610f17575b5050506000998a5250506066602052604090972060038101546004909101549698959794969495600160a060020a03909116949350915050565b600054610100900460ff1680610f7e5750610f7e61128a565b80610f8c575060005460ff16155b610fca5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611372602e913960400191505060405180910390fd5b600054610100900460ff16158015610ff5576000805460ff1961ff0019909116610100171660011790555b600160a060020a038516158015906110155750600160a060020a03841615155b80156110295750600160a060020a03831615155b801561103d5750600160a060020a03821615155b611091576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b61109a85610b92565b606a8054600160a060020a0380871673ffffffffffffffffffffffffffffffffffffffff1992831617909255606b8054868416908316179055606c80549285169290911691909117905580156110f6576000805461ff00191690555b5050505050565b60008481526020869052604081206004015415611164576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b6040805160a081018252858152600160a060020a03858116602080840191825283850187815233606086015243608086015260008b81528c83529590952084518155915160018301805473ffffffffffffffffffffffffffffffffffffffff19169190941617909255925180519293926111e4926002850192019061130c565b5060608201516003828101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03938416179055608090930151600490920191909155908701805460018181018355600083815260208082209093018a90559788528981018252604080892080548084018255908a52838a20018a90559690931687526002909801885293852080549182018155855295909320909401929092555054919050565b303b1590565b600160a060020a0381166112a357600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b828054828255906000526020600020908101928215611347579160200282015b8281111561134757825182559160200191906001019061132c565b50611353929150611357565b5090565b61077a91905b80821115611353576000815560010161135d56fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582046eebc5cc190eec2e987d0c9dc8a42936a92060259b9db1ac5f87da2e953147b0029",
-  "address": "0xfC6DB8141144831a8B7d858f356D0d1148d8F11d",
-  "implementation": "0xF183b418681a169F7bFaB67279ce9c66A9C4b13D",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/AgreementStoreManager.kovan.json b/artifacts/AgreementStoreManager.kovan.json
deleted file mode 100644
index f8722f0..0000000
--- a/artifacts/AgreementStoreManager.kovan.json
+++ /dev/null
@@ -1,326 +0,0 @@
-{
-  "name": "AgreementStoreManager",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_templateStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_didRegistryAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf8c8765e"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_conditionTypes",
-          "type": "address[]"
-        },
-        {
-          "name": "_conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        }
-      ],
-      "name": "createAgreement",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x955d0c2a"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreement",
-      "outputs": [
-        {
-          "name": "did",
-          "type": "bytes32"
-        },
-        {
-          "name": "didOwner",
-          "type": "address"
-        },
-        {
-          "name": "templateId",
-          "type": "address"
-        },
-        {
-          "name": "conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xf42eb765"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreementDIDOwner",
-      "outputs": [
-        {
-          "name": "didOwner",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x17cfbf5e"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "isAgreementDIDOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xd1c1db39"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "isAgreementDIDProvider",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcaf92b8b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getAgreementListSize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8a9013cb"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreementIdsForDID",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8945226e"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_templateId",
-          "type": "address"
-        }
-      ],
-      "name": "getAgreementIdsForTemplateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xa340c34f"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506113cb806100206000396000f3fe608060405234801561001057600080fd5b5060043610610107576000357c010000000000000000000000000000000000000000000000000000000090048063a340c34f116100a9578063d1c1db3911610083578063d1c1db39146104ad578063f2fde38b146104d9578063f42eb765146104ff578063f8c8765e146105c957610107565b8063a340c34f14610435578063c4d66de81461045b578063caf92b8b1461048157610107565b80638a9013cb116100e55780638a9013cb146101bc5780638da5cb5b146101d65780638f32d59b146101de578063955d0c2a146101fa57610107565b806317cfbf5e1461010c578063715018a6146101455780638945226e1461014f575b600080fd5b6101296004803603602081101561012257600080fd5b5035610607565b60408051600160a060020a039092168252519081900360200190f35b61014d6106ac565b005b61016c6004803603602081101561016557600080fd5b5035610714565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156101a8578181015183820152602001610190565b505050509050019250505060405180910390f35b6101c4610776565b60408051918252519081900360200190f35b61012961077d565b6101e661078c565b604080519115158252519081900360200190f35b6101c4600480360360c081101561021057600080fd5b81359160208101359181019060608101604082013564010000000081111561023757600080fd5b82018360208201111561024957600080fd5b8035906020019184602083028401116401000000008311171561026b57600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156102bb57600080fd5b8201836020820111156102cd57600080fd5b803590602001918460208302840111640100000000831117156102ef57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561033f57600080fd5b82018360208201111561035157600080fd5b8035906020019184602083028401116401000000008311171561037357600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156103c357600080fd5b8201836020820111156103d557600080fd5b803590602001918460208302840111640100000000831117156103f757600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092955061079d945050505050565b61016c6004803603602081101561044b57600080fd5b5035600160a060020a0316610b28565b61014d6004803603602081101561047157600080fd5b5035600160a060020a0316610b92565b6101e66004803603604081101561049757600080fd5b5080359060200135600160a060020a0316610c94565b6101e6600480360360408110156104c357600080fd5b5080359060200135600160a060020a0316610d42565b61014d600480360360208110156104ef57600080fd5b5035600160a060020a0316610df7565b61051c6004803603602081101561051557600080fd5b5035610e14565b6040518087815260200186600160a060020a0316600160a060020a0316815260200185600160a060020a0316600160a060020a031681526020018060200184600160a060020a0316600160a060020a03168152602001838152602001828103825285818151815260200191508051906020019060200280838360005b838110156105b0578181015183820152602001610598565b5050505090500197505050505050505060405180910390f35b61014d600480360360808110156105df57600080fd5b50600160a060020a038135811691602081013582169160408201358116916060013516610f65565b600081815260666020908152604080832054606c5482517f6c2ef5240000000000000000000000000000000000000000000000000000000081526004810183905292519193600160a060020a0390911692636c2ef5249260248083019392829003018186803b15801561067957600080fd5b505afa15801561068d573d6000803e3d6000fd5b505050506040513d60208110156106a357600080fd5b50519392505050565b6106b461078c565b6106bd57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b60008181526067602090815260409182902080548351818402810184019094528084526060939283018282801561076a57602002820191906000526020600020905b815481526020019060010190808311610756575b50505050509050919050565b6069545b90565b603354600160a060020a031690565b603354600160a060020a0316331490565b606b54604080517fb727a2550000000000000000000000000000000000000000000000000000000081523360048201529051600092600160a060020a03169163b727a255916024808301926020929190829003018186803b15801561080157600080fd5b505afa158015610815573d6000803e3d6000fd5b505050506040513d602081101561082b57600080fd5b50511515600114610886576040805160e560020a62461bcd02815260206004820152601560248201527f54656d706c617465206e6f7420417070726f7665640000000000000000000000604482015290519081900360640190fd5b606c54604080517fbbc1dede000000000000000000000000000000000000000000000000000000008152600481018990529051600092600160a060020a03169163bbc1dede916024808301926020929190829003018186803b1580156108eb57600080fd5b505afa1580156108ff573d6000803e3d6000fd5b505050506040513d602081101561091557600080fd5b50511161096c576040805160e560020a62461bcd02815260206004820152601260248201527f444944206e6f7420726567697374657265640000000000000000000000000000604482015290519081900360640190fd5b8451845114801561097e575084518351145b801561098b575084518251145b6109df576040805160e560020a62461bcd02815260206004820152601b60248201527f417267756d656e747320686176652077726f6e67206c656e6774680000000000604482015290519081900360640190fd5b60005b8551811015610aff57606a548551600160a060020a039091169063fe3ae90f90879084908110610a0e57fe5b6020026020010151888481518110610a2257fe5b6020026020010151878581518110610a3657fe5b6020026020010151878681518110610a4a57fe5b60200260200101516040518563ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018085815260200184600160a060020a0316600160a060020a03168152602001838152602001828152602001945050505050602060405180830381600087803b158015610acb57600080fd5b505af1158015610adf573d6000803e3d6000fd5b505050506040513d6020811015610af557600080fd5b50506001016109e2565b50610b1460668888338863ffffffff6110fd16565b50610b1d610776565b979650505050505050565b600160a060020a03811660009081526068602090815260409182902080548351818402810184019094528084526060939283018282801561076a57602002820191906000526020600020908154815260200190600101908083116107565750505050509050919050565b600054610100900460ff1680610bab5750610bab61128a565b80610bb9575060005460ff16155b610bf75760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611372602e913960400191505060405180910390fd5b600054610100900460ff16158015610c22576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610c90576000805461ff00191690555b5050565b600082815260666020908152604080832054606c5482517f3c6aa7b700000000000000000000000000000000000000000000000000000000815260048101839052600160a060020a038781166024830152935192949390911692633c6aa7b792604480840193829003018186803b158015610d0e57600080fd5b505afa158015610d22573d6000803e3d6000fd5b505050506040513d6020811015610d3857600080fd5b5051949350505050565b600082815260666020908152604080832054606c5482517f6c2ef5240000000000000000000000000000000000000000000000000000000081526004810183905292519193600160a060020a0390911692636c2ef5249260248083019392829003018186803b158015610db457600080fd5b505afa158015610dc8573d6000803e3d6000fd5b505050506040513d6020811015610dde57600080fd5b5051600160a060020a0384811691161491505092915050565b610dff61078c565b610e0857600080fd5b610e1181611290565b50565b600081815260666020908152604080832054606c5482517f6c2ef524000000000000000000000000000000000000000000000000000000008152600481018390529251919493849360609385938493600160a060020a0390911692636c2ef5249260248083019392829003018186803b158015610e9057600080fd5b505afa158015610ea4573d6000803e3d6000fd5b505050506040513d6020811015610eba57600080fd5b5051600088815260666020908152604091829020600181015460029091018054845181850281018501909552808552949950600160a060020a039091169750919290830182828015610f2b57602002820191906000526020600020905b815481526020019060010190808311610f17575b5050506000998a5250506066602052604090972060038101546004909101549698959794969495600160a060020a03909116949350915050565b600054610100900460ff1680610f7e5750610f7e61128a565b80610f8c575060005460ff16155b610fca5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611372602e913960400191505060405180910390fd5b600054610100900460ff16158015610ff5576000805460ff1961ff0019909116610100171660011790555b600160a060020a038516158015906110155750600160a060020a03841615155b80156110295750600160a060020a03831615155b801561103d5750600160a060020a03821615155b611091576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b61109a85610b92565b606a8054600160a060020a0380871673ffffffffffffffffffffffffffffffffffffffff1992831617909255606b8054868416908316179055606c80549285169290911691909117905580156110f6576000805461ff00191690555b5050505050565b60008481526020869052604081206004015415611164576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b6040805160a081018252858152600160a060020a03858116602080840191825283850187815233606086015243608086015260008b81528c83529590952084518155915160018301805473ffffffffffffffffffffffffffffffffffffffff19169190941617909255925180519293926111e4926002850192019061130c565b5060608201516003828101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03938416179055608090930151600490920191909155908701805460018181018355600083815260208082209093018a90559788528981018252604080892080548084018255908a52838a20018a90559690931687526002909801885293852080549182018155855295909320909401929092555054919050565b303b1590565b600160a060020a0381166112a357600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b828054828255906000526020600020908101928215611347579160200282015b8281111561134757825182559160200191906001019061132c565b50611353929150611357565b5090565b61077a91905b80821115611353576000815560010161135d56fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582046eebc5cc190eec2e987d0c9dc8a42936a92060259b9db1ac5f87da2e953147b0029",
-  "address": "0x412d4F57425b41FE027e06b9f37D569dcAE2eAa4",
-  "implementation": "0x55124b016d5D6e1508114B3365f6b1b61597dC3b",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/AgreementStoreManager.mainnet.json b/artifacts/AgreementStoreManager.mainnet.json
deleted file mode 100644
index 2f71942..0000000
--- a/artifacts/AgreementStoreManager.mainnet.json
+++ /dev/null
@@ -1,326 +0,0 @@
-{
-  "name": "AgreementStoreManager",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_templateStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_didRegistryAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf8c8765e"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_conditionTypes",
-          "type": "address[]"
-        },
-        {
-          "name": "_conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        }
-      ],
-      "name": "createAgreement",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x955d0c2a"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreement",
-      "outputs": [
-        {
-          "name": "did",
-          "type": "bytes32"
-        },
-        {
-          "name": "didOwner",
-          "type": "address"
-        },
-        {
-          "name": "templateId",
-          "type": "address"
-        },
-        {
-          "name": "conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xf42eb765"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreementDIDOwner",
-      "outputs": [
-        {
-          "name": "didOwner",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x17cfbf5e"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "isAgreementDIDOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xd1c1db39"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "isAgreementDIDProvider",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcaf92b8b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getAgreementListSize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8a9013cb"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreementIdsForDID",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8945226e"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_templateId",
-          "type": "address"
-        }
-      ],
-      "name": "getAgreementIdsForTemplateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xa340c34f"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506113cb806100206000396000f3fe608060405234801561001057600080fd5b5060043610610107576000357c010000000000000000000000000000000000000000000000000000000090048063a340c34f116100a9578063d1c1db3911610083578063d1c1db39146104ad578063f2fde38b146104d9578063f42eb765146104ff578063f8c8765e146105c957610107565b8063a340c34f14610435578063c4d66de81461045b578063caf92b8b1461048157610107565b80638a9013cb116100e55780638a9013cb146101bc5780638da5cb5b146101d65780638f32d59b146101de578063955d0c2a146101fa57610107565b806317cfbf5e1461010c578063715018a6146101455780638945226e1461014f575b600080fd5b6101296004803603602081101561012257600080fd5b5035610607565b60408051600160a060020a039092168252519081900360200190f35b61014d6106ac565b005b61016c6004803603602081101561016557600080fd5b5035610714565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156101a8578181015183820152602001610190565b505050509050019250505060405180910390f35b6101c4610776565b60408051918252519081900360200190f35b61012961077d565b6101e661078c565b604080519115158252519081900360200190f35b6101c4600480360360c081101561021057600080fd5b81359160208101359181019060608101604082013564010000000081111561023757600080fd5b82018360208201111561024957600080fd5b8035906020019184602083028401116401000000008311171561026b57600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156102bb57600080fd5b8201836020820111156102cd57600080fd5b803590602001918460208302840111640100000000831117156102ef57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561033f57600080fd5b82018360208201111561035157600080fd5b8035906020019184602083028401116401000000008311171561037357600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156103c357600080fd5b8201836020820111156103d557600080fd5b803590602001918460208302840111640100000000831117156103f757600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092955061079d945050505050565b61016c6004803603602081101561044b57600080fd5b5035600160a060020a0316610b28565b61014d6004803603602081101561047157600080fd5b5035600160a060020a0316610b92565b6101e66004803603604081101561049757600080fd5b5080359060200135600160a060020a0316610c94565b6101e6600480360360408110156104c357600080fd5b5080359060200135600160a060020a0316610d42565b61014d600480360360208110156104ef57600080fd5b5035600160a060020a0316610df7565b61051c6004803603602081101561051557600080fd5b5035610e14565b6040518087815260200186600160a060020a0316600160a060020a0316815260200185600160a060020a0316600160a060020a031681526020018060200184600160a060020a0316600160a060020a03168152602001838152602001828103825285818151815260200191508051906020019060200280838360005b838110156105b0578181015183820152602001610598565b5050505090500197505050505050505060405180910390f35b61014d600480360360808110156105df57600080fd5b50600160a060020a038135811691602081013582169160408201358116916060013516610f65565b600081815260666020908152604080832054606c5482517f6c2ef5240000000000000000000000000000000000000000000000000000000081526004810183905292519193600160a060020a0390911692636c2ef5249260248083019392829003018186803b15801561067957600080fd5b505afa15801561068d573d6000803e3d6000fd5b505050506040513d60208110156106a357600080fd5b50519392505050565b6106b461078c565b6106bd57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b60008181526067602090815260409182902080548351818402810184019094528084526060939283018282801561076a57602002820191906000526020600020905b815481526020019060010190808311610756575b50505050509050919050565b6069545b90565b603354600160a060020a031690565b603354600160a060020a0316331490565b606b54604080517fb727a2550000000000000000000000000000000000000000000000000000000081523360048201529051600092600160a060020a03169163b727a255916024808301926020929190829003018186803b15801561080157600080fd5b505afa158015610815573d6000803e3d6000fd5b505050506040513d602081101561082b57600080fd5b50511515600114610886576040805160e560020a62461bcd02815260206004820152601560248201527f54656d706c617465206e6f7420417070726f7665640000000000000000000000604482015290519081900360640190fd5b606c54604080517fbbc1dede000000000000000000000000000000000000000000000000000000008152600481018990529051600092600160a060020a03169163bbc1dede916024808301926020929190829003018186803b1580156108eb57600080fd5b505afa1580156108ff573d6000803e3d6000fd5b505050506040513d602081101561091557600080fd5b50511161096c576040805160e560020a62461bcd02815260206004820152601260248201527f444944206e6f7420726567697374657265640000000000000000000000000000604482015290519081900360640190fd5b8451845114801561097e575084518351145b801561098b575084518251145b6109df576040805160e560020a62461bcd02815260206004820152601b60248201527f417267756d656e747320686176652077726f6e67206c656e6774680000000000604482015290519081900360640190fd5b60005b8551811015610aff57606a548551600160a060020a039091169063fe3ae90f90879084908110610a0e57fe5b6020026020010151888481518110610a2257fe5b6020026020010151878581518110610a3657fe5b6020026020010151878681518110610a4a57fe5b60200260200101516040518563ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018085815260200184600160a060020a0316600160a060020a03168152602001838152602001828152602001945050505050602060405180830381600087803b158015610acb57600080fd5b505af1158015610adf573d6000803e3d6000fd5b505050506040513d6020811015610af557600080fd5b50506001016109e2565b50610b1460668888338863ffffffff6110fd16565b50610b1d610776565b979650505050505050565b600160a060020a03811660009081526068602090815260409182902080548351818402810184019094528084526060939283018282801561076a57602002820191906000526020600020908154815260200190600101908083116107565750505050509050919050565b600054610100900460ff1680610bab5750610bab61128a565b80610bb9575060005460ff16155b610bf75760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611372602e913960400191505060405180910390fd5b600054610100900460ff16158015610c22576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610c90576000805461ff00191690555b5050565b600082815260666020908152604080832054606c5482517f3c6aa7b700000000000000000000000000000000000000000000000000000000815260048101839052600160a060020a038781166024830152935192949390911692633c6aa7b792604480840193829003018186803b158015610d0e57600080fd5b505afa158015610d22573d6000803e3d6000fd5b505050506040513d6020811015610d3857600080fd5b5051949350505050565b600082815260666020908152604080832054606c5482517f6c2ef5240000000000000000000000000000000000000000000000000000000081526004810183905292519193600160a060020a0390911692636c2ef5249260248083019392829003018186803b158015610db457600080fd5b505afa158015610dc8573d6000803e3d6000fd5b505050506040513d6020811015610dde57600080fd5b5051600160a060020a0384811691161491505092915050565b610dff61078c565b610e0857600080fd5b610e1181611290565b50565b600081815260666020908152604080832054606c5482517f6c2ef524000000000000000000000000000000000000000000000000000000008152600481018390529251919493849360609385938493600160a060020a0390911692636c2ef5249260248083019392829003018186803b158015610e9057600080fd5b505afa158015610ea4573d6000803e3d6000fd5b505050506040513d6020811015610eba57600080fd5b5051600088815260666020908152604091829020600181015460029091018054845181850281018501909552808552949950600160a060020a039091169750919290830182828015610f2b57602002820191906000526020600020905b815481526020019060010190808311610f17575b5050506000998a5250506066602052604090972060038101546004909101549698959794969495600160a060020a03909116949350915050565b600054610100900460ff1680610f7e5750610f7e61128a565b80610f8c575060005460ff16155b610fca5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611372602e913960400191505060405180910390fd5b600054610100900460ff16158015610ff5576000805460ff1961ff0019909116610100171660011790555b600160a060020a038516158015906110155750600160a060020a03841615155b80156110295750600160a060020a03831615155b801561103d5750600160a060020a03821615155b611091576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b61109a85610b92565b606a8054600160a060020a0380871673ffffffffffffffffffffffffffffffffffffffff1992831617909255606b8054868416908316179055606c80549285169290911691909117905580156110f6576000805461ff00191690555b5050505050565b60008481526020869052604081206004015415611164576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b6040805160a081018252858152600160a060020a03858116602080840191825283850187815233606086015243608086015260008b81528c83529590952084518155915160018301805473ffffffffffffffffffffffffffffffffffffffff19169190941617909255925180519293926111e4926002850192019061130c565b5060608201516003828101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03938416179055608090930151600490920191909155908701805460018181018355600083815260208082209093018a90559788528981018252604080892080548084018255908a52838a20018a90559690931687526002909801885293852080549182018155855295909320909401929092555054919050565b303b1590565b600160a060020a0381166112a357600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b828054828255906000526020600020908101928215611347579160200282015b8281111561134757825182559160200191906001019061132c565b50611353929150611357565b5090565b61077a91905b80821115611353576000815560010161135d56fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582046eebc5cc190eec2e987d0c9dc8a42936a92060259b9db1ac5f87da2e953147b0029",
-  "address": "0x5E98B9EfABe192aB02a9B39D9B44A22C88A625BD",
-  "implementation": "0x0AD3cbB173f086009262e8F0Ea6122C10B1748DC",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/AgreementStoreManager.nile.json b/artifacts/AgreementStoreManager.nile.json
deleted file mode 100644
index dc2e5ba..0000000
--- a/artifacts/AgreementStoreManager.nile.json
+++ /dev/null
@@ -1,326 +0,0 @@
-{
-  "name": "AgreementStoreManager",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_templateStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_didRegistryAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf8c8765e"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_conditionTypes",
-          "type": "address[]"
-        },
-        {
-          "name": "_conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        }
-      ],
-      "name": "createAgreement",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x955d0c2a"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreement",
-      "outputs": [
-        {
-          "name": "did",
-          "type": "bytes32"
-        },
-        {
-          "name": "didOwner",
-          "type": "address"
-        },
-        {
-          "name": "templateId",
-          "type": "address"
-        },
-        {
-          "name": "conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xf42eb765"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreementDIDOwner",
-      "outputs": [
-        {
-          "name": "didOwner",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x17cfbf5e"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "isAgreementDIDOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xd1c1db39"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "isAgreementDIDProvider",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcaf92b8b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getAgreementListSize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8a9013cb"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreementIdsForDID",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8945226e"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_templateId",
-          "type": "address"
-        }
-      ],
-      "name": "getAgreementIdsForTemplateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xa340c34f"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506113cb806100206000396000f3fe608060405234801561001057600080fd5b5060043610610107576000357c010000000000000000000000000000000000000000000000000000000090048063a340c34f116100a9578063d1c1db3911610083578063d1c1db39146104ad578063f2fde38b146104d9578063f42eb765146104ff578063f8c8765e146105c957610107565b8063a340c34f14610435578063c4d66de81461045b578063caf92b8b1461048157610107565b80638a9013cb116100e55780638a9013cb146101bc5780638da5cb5b146101d65780638f32d59b146101de578063955d0c2a146101fa57610107565b806317cfbf5e1461010c578063715018a6146101455780638945226e1461014f575b600080fd5b6101296004803603602081101561012257600080fd5b5035610607565b60408051600160a060020a039092168252519081900360200190f35b61014d6106ac565b005b61016c6004803603602081101561016557600080fd5b5035610714565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156101a8578181015183820152602001610190565b505050509050019250505060405180910390f35b6101c4610776565b60408051918252519081900360200190f35b61012961077d565b6101e661078c565b604080519115158252519081900360200190f35b6101c4600480360360c081101561021057600080fd5b81359160208101359181019060608101604082013564010000000081111561023757600080fd5b82018360208201111561024957600080fd5b8035906020019184602083028401116401000000008311171561026b57600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156102bb57600080fd5b8201836020820111156102cd57600080fd5b803590602001918460208302840111640100000000831117156102ef57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561033f57600080fd5b82018360208201111561035157600080fd5b8035906020019184602083028401116401000000008311171561037357600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156103c357600080fd5b8201836020820111156103d557600080fd5b803590602001918460208302840111640100000000831117156103f757600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092955061079d945050505050565b61016c6004803603602081101561044b57600080fd5b5035600160a060020a0316610b28565b61014d6004803603602081101561047157600080fd5b5035600160a060020a0316610b92565b6101e66004803603604081101561049757600080fd5b5080359060200135600160a060020a0316610c94565b6101e6600480360360408110156104c357600080fd5b5080359060200135600160a060020a0316610d42565b61014d600480360360208110156104ef57600080fd5b5035600160a060020a0316610df7565b61051c6004803603602081101561051557600080fd5b5035610e14565b6040518087815260200186600160a060020a0316600160a060020a0316815260200185600160a060020a0316600160a060020a031681526020018060200184600160a060020a0316600160a060020a03168152602001838152602001828103825285818151815260200191508051906020019060200280838360005b838110156105b0578181015183820152602001610598565b5050505090500197505050505050505060405180910390f35b61014d600480360360808110156105df57600080fd5b50600160a060020a038135811691602081013582169160408201358116916060013516610f65565b600081815260666020908152604080832054606c5482517f6c2ef5240000000000000000000000000000000000000000000000000000000081526004810183905292519193600160a060020a0390911692636c2ef5249260248083019392829003018186803b15801561067957600080fd5b505afa15801561068d573d6000803e3d6000fd5b505050506040513d60208110156106a357600080fd5b50519392505050565b6106b461078c565b6106bd57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b60008181526067602090815260409182902080548351818402810184019094528084526060939283018282801561076a57602002820191906000526020600020905b815481526020019060010190808311610756575b50505050509050919050565b6069545b90565b603354600160a060020a031690565b603354600160a060020a0316331490565b606b54604080517fb727a2550000000000000000000000000000000000000000000000000000000081523360048201529051600092600160a060020a03169163b727a255916024808301926020929190829003018186803b15801561080157600080fd5b505afa158015610815573d6000803e3d6000fd5b505050506040513d602081101561082b57600080fd5b50511515600114610886576040805160e560020a62461bcd02815260206004820152601560248201527f54656d706c617465206e6f7420417070726f7665640000000000000000000000604482015290519081900360640190fd5b606c54604080517fbbc1dede000000000000000000000000000000000000000000000000000000008152600481018990529051600092600160a060020a03169163bbc1dede916024808301926020929190829003018186803b1580156108eb57600080fd5b505afa1580156108ff573d6000803e3d6000fd5b505050506040513d602081101561091557600080fd5b50511161096c576040805160e560020a62461bcd02815260206004820152601260248201527f444944206e6f7420726567697374657265640000000000000000000000000000604482015290519081900360640190fd5b8451845114801561097e575084518351145b801561098b575084518251145b6109df576040805160e560020a62461bcd02815260206004820152601b60248201527f417267756d656e747320686176652077726f6e67206c656e6774680000000000604482015290519081900360640190fd5b60005b8551811015610aff57606a548551600160a060020a039091169063fe3ae90f90879084908110610a0e57fe5b6020026020010151888481518110610a2257fe5b6020026020010151878581518110610a3657fe5b6020026020010151878681518110610a4a57fe5b60200260200101516040518563ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018085815260200184600160a060020a0316600160a060020a03168152602001838152602001828152602001945050505050602060405180830381600087803b158015610acb57600080fd5b505af1158015610adf573d6000803e3d6000fd5b505050506040513d6020811015610af557600080fd5b50506001016109e2565b50610b1460668888338863ffffffff6110fd16565b50610b1d610776565b979650505050505050565b600160a060020a03811660009081526068602090815260409182902080548351818402810184019094528084526060939283018282801561076a57602002820191906000526020600020908154815260200190600101908083116107565750505050509050919050565b600054610100900460ff1680610bab5750610bab61128a565b80610bb9575060005460ff16155b610bf75760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611372602e913960400191505060405180910390fd5b600054610100900460ff16158015610c22576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610c90576000805461ff00191690555b5050565b600082815260666020908152604080832054606c5482517f3c6aa7b700000000000000000000000000000000000000000000000000000000815260048101839052600160a060020a038781166024830152935192949390911692633c6aa7b792604480840193829003018186803b158015610d0e57600080fd5b505afa158015610d22573d6000803e3d6000fd5b505050506040513d6020811015610d3857600080fd5b5051949350505050565b600082815260666020908152604080832054606c5482517f6c2ef5240000000000000000000000000000000000000000000000000000000081526004810183905292519193600160a060020a0390911692636c2ef5249260248083019392829003018186803b158015610db457600080fd5b505afa158015610dc8573d6000803e3d6000fd5b505050506040513d6020811015610dde57600080fd5b5051600160a060020a0384811691161491505092915050565b610dff61078c565b610e0857600080fd5b610e1181611290565b50565b600081815260666020908152604080832054606c5482517f6c2ef524000000000000000000000000000000000000000000000000000000008152600481018390529251919493849360609385938493600160a060020a0390911692636c2ef5249260248083019392829003018186803b158015610e9057600080fd5b505afa158015610ea4573d6000803e3d6000fd5b505050506040513d6020811015610eba57600080fd5b5051600088815260666020908152604091829020600181015460029091018054845181850281018501909552808552949950600160a060020a039091169750919290830182828015610f2b57602002820191906000526020600020905b815481526020019060010190808311610f17575b5050506000998a5250506066602052604090972060038101546004909101549698959794969495600160a060020a03909116949350915050565b600054610100900460ff1680610f7e5750610f7e61128a565b80610f8c575060005460ff16155b610fca5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611372602e913960400191505060405180910390fd5b600054610100900460ff16158015610ff5576000805460ff1961ff0019909116610100171660011790555b600160a060020a038516158015906110155750600160a060020a03841615155b80156110295750600160a060020a03831615155b801561103d5750600160a060020a03821615155b611091576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b61109a85610b92565b606a8054600160a060020a0380871673ffffffffffffffffffffffffffffffffffffffff1992831617909255606b8054868416908316179055606c80549285169290911691909117905580156110f6576000805461ff00191690555b5050505050565b60008481526020869052604081206004015415611164576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b6040805160a081018252858152600160a060020a03858116602080840191825283850187815233606086015243608086015260008b81528c83529590952084518155915160018301805473ffffffffffffffffffffffffffffffffffffffff19169190941617909255925180519293926111e4926002850192019061130c565b5060608201516003828101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03938416179055608090930151600490920191909155908701805460018181018355600083815260208082209093018a90559788528981018252604080892080548084018255908a52838a20018a90559690931687526002909801885293852080549182018155855295909320909401929092555054919050565b303b1590565b600160a060020a0381166112a357600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b828054828255906000526020600020908101928215611347579160200282015b8281111561134757825182559160200191906001019061132c565b50611353929150611357565b5090565b61077a91905b80821115611353576000815560010161135d56fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582046eebc5cc190eec2e987d0c9dc8a42936a92060259b9db1ac5f87da2e953147b0029",
-  "address": "0x62f84700b1A0ea6Bfb505aDC3c0286B7944D247C",
-  "implementation": "0xff550CFe58FFB6b1E6b6BEf89070D5755e8De374",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/AgreementStoreManager.pacific.json b/artifacts/AgreementStoreManager.pacific.json
deleted file mode 100644
index e052294..0000000
--- a/artifacts/AgreementStoreManager.pacific.json
+++ /dev/null
@@ -1,326 +0,0 @@
-{
-  "name": "AgreementStoreManager",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_templateStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_didRegistryAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf8c8765e"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_conditionTypes",
-          "type": "address[]"
-        },
-        {
-          "name": "_conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        }
-      ],
-      "name": "createAgreement",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x955d0c2a"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreement",
-      "outputs": [
-        {
-          "name": "did",
-          "type": "bytes32"
-        },
-        {
-          "name": "didOwner",
-          "type": "address"
-        },
-        {
-          "name": "templateId",
-          "type": "address"
-        },
-        {
-          "name": "conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xf42eb765"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreementDIDOwner",
-      "outputs": [
-        {
-          "name": "didOwner",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x17cfbf5e"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "isAgreementDIDOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xd1c1db39"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "isAgreementDIDProvider",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcaf92b8b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getAgreementListSize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8a9013cb"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreementIdsForDID",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8945226e"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_templateId",
-          "type": "address"
-        }
-      ],
-      "name": "getAgreementIdsForTemplateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xa340c34f"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506113cb806100206000396000f3fe608060405234801561001057600080fd5b5060043610610107576000357c010000000000000000000000000000000000000000000000000000000090048063a340c34f116100a9578063d1c1db3911610083578063d1c1db39146104ad578063f2fde38b146104d9578063f42eb765146104ff578063f8c8765e146105c957610107565b8063a340c34f14610435578063c4d66de81461045b578063caf92b8b1461048157610107565b80638a9013cb116100e55780638a9013cb146101bc5780638da5cb5b146101d65780638f32d59b146101de578063955d0c2a146101fa57610107565b806317cfbf5e1461010c578063715018a6146101455780638945226e1461014f575b600080fd5b6101296004803603602081101561012257600080fd5b5035610607565b60408051600160a060020a039092168252519081900360200190f35b61014d6106ac565b005b61016c6004803603602081101561016557600080fd5b5035610714565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156101a8578181015183820152602001610190565b505050509050019250505060405180910390f35b6101c4610776565b60408051918252519081900360200190f35b61012961077d565b6101e661078c565b604080519115158252519081900360200190f35b6101c4600480360360c081101561021057600080fd5b81359160208101359181019060608101604082013564010000000081111561023757600080fd5b82018360208201111561024957600080fd5b8035906020019184602083028401116401000000008311171561026b57600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156102bb57600080fd5b8201836020820111156102cd57600080fd5b803590602001918460208302840111640100000000831117156102ef57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561033f57600080fd5b82018360208201111561035157600080fd5b8035906020019184602083028401116401000000008311171561037357600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156103c357600080fd5b8201836020820111156103d557600080fd5b803590602001918460208302840111640100000000831117156103f757600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092955061079d945050505050565b61016c6004803603602081101561044b57600080fd5b5035600160a060020a0316610b28565b61014d6004803603602081101561047157600080fd5b5035600160a060020a0316610b92565b6101e66004803603604081101561049757600080fd5b5080359060200135600160a060020a0316610c94565b6101e6600480360360408110156104c357600080fd5b5080359060200135600160a060020a0316610d42565b61014d600480360360208110156104ef57600080fd5b5035600160a060020a0316610df7565b61051c6004803603602081101561051557600080fd5b5035610e14565b6040518087815260200186600160a060020a0316600160a060020a0316815260200185600160a060020a0316600160a060020a031681526020018060200184600160a060020a0316600160a060020a03168152602001838152602001828103825285818151815260200191508051906020019060200280838360005b838110156105b0578181015183820152602001610598565b5050505090500197505050505050505060405180910390f35b61014d600480360360808110156105df57600080fd5b50600160a060020a038135811691602081013582169160408201358116916060013516610f65565b600081815260666020908152604080832054606c5482517f6c2ef5240000000000000000000000000000000000000000000000000000000081526004810183905292519193600160a060020a0390911692636c2ef5249260248083019392829003018186803b15801561067957600080fd5b505afa15801561068d573d6000803e3d6000fd5b505050506040513d60208110156106a357600080fd5b50519392505050565b6106b461078c565b6106bd57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b60008181526067602090815260409182902080548351818402810184019094528084526060939283018282801561076a57602002820191906000526020600020905b815481526020019060010190808311610756575b50505050509050919050565b6069545b90565b603354600160a060020a031690565b603354600160a060020a0316331490565b606b54604080517fb727a2550000000000000000000000000000000000000000000000000000000081523360048201529051600092600160a060020a03169163b727a255916024808301926020929190829003018186803b15801561080157600080fd5b505afa158015610815573d6000803e3d6000fd5b505050506040513d602081101561082b57600080fd5b50511515600114610886576040805160e560020a62461bcd02815260206004820152601560248201527f54656d706c617465206e6f7420417070726f7665640000000000000000000000604482015290519081900360640190fd5b606c54604080517fbbc1dede000000000000000000000000000000000000000000000000000000008152600481018990529051600092600160a060020a03169163bbc1dede916024808301926020929190829003018186803b1580156108eb57600080fd5b505afa1580156108ff573d6000803e3d6000fd5b505050506040513d602081101561091557600080fd5b50511161096c576040805160e560020a62461bcd02815260206004820152601260248201527f444944206e6f7420726567697374657265640000000000000000000000000000604482015290519081900360640190fd5b8451845114801561097e575084518351145b801561098b575084518251145b6109df576040805160e560020a62461bcd02815260206004820152601b60248201527f417267756d656e747320686176652077726f6e67206c656e6774680000000000604482015290519081900360640190fd5b60005b8551811015610aff57606a548551600160a060020a039091169063fe3ae90f90879084908110610a0e57fe5b6020026020010151888481518110610a2257fe5b6020026020010151878581518110610a3657fe5b6020026020010151878681518110610a4a57fe5b60200260200101516040518563ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018085815260200184600160a060020a0316600160a060020a03168152602001838152602001828152602001945050505050602060405180830381600087803b158015610acb57600080fd5b505af1158015610adf573d6000803e3d6000fd5b505050506040513d6020811015610af557600080fd5b50506001016109e2565b50610b1460668888338863ffffffff6110fd16565b50610b1d610776565b979650505050505050565b600160a060020a03811660009081526068602090815260409182902080548351818402810184019094528084526060939283018282801561076a57602002820191906000526020600020908154815260200190600101908083116107565750505050509050919050565b600054610100900460ff1680610bab5750610bab61128a565b80610bb9575060005460ff16155b610bf75760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611372602e913960400191505060405180910390fd5b600054610100900460ff16158015610c22576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610c90576000805461ff00191690555b5050565b600082815260666020908152604080832054606c5482517f3c6aa7b700000000000000000000000000000000000000000000000000000000815260048101839052600160a060020a038781166024830152935192949390911692633c6aa7b792604480840193829003018186803b158015610d0e57600080fd5b505afa158015610d22573d6000803e3d6000fd5b505050506040513d6020811015610d3857600080fd5b5051949350505050565b600082815260666020908152604080832054606c5482517f6c2ef5240000000000000000000000000000000000000000000000000000000081526004810183905292519193600160a060020a0390911692636c2ef5249260248083019392829003018186803b158015610db457600080fd5b505afa158015610dc8573d6000803e3d6000fd5b505050506040513d6020811015610dde57600080fd5b5051600160a060020a0384811691161491505092915050565b610dff61078c565b610e0857600080fd5b610e1181611290565b50565b600081815260666020908152604080832054606c5482517f6c2ef524000000000000000000000000000000000000000000000000000000008152600481018390529251919493849360609385938493600160a060020a0390911692636c2ef5249260248083019392829003018186803b158015610e9057600080fd5b505afa158015610ea4573d6000803e3d6000fd5b505050506040513d6020811015610eba57600080fd5b5051600088815260666020908152604091829020600181015460029091018054845181850281018501909552808552949950600160a060020a039091169750919290830182828015610f2b57602002820191906000526020600020905b815481526020019060010190808311610f17575b5050506000998a5250506066602052604090972060038101546004909101549698959794969495600160a060020a03909116949350915050565b600054610100900460ff1680610f7e5750610f7e61128a565b80610f8c575060005460ff16155b610fca5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611372602e913960400191505060405180910390fd5b600054610100900460ff16158015610ff5576000805460ff1961ff0019909116610100171660011790555b600160a060020a038516158015906110155750600160a060020a03841615155b80156110295750600160a060020a03831615155b801561103d5750600160a060020a03821615155b611091576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b61109a85610b92565b606a8054600160a060020a0380871673ffffffffffffffffffffffffffffffffffffffff1992831617909255606b8054868416908316179055606c80549285169290911691909117905580156110f6576000805461ff00191690555b5050505050565b60008481526020869052604081206004015415611164576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b6040805160a081018252858152600160a060020a03858116602080840191825283850187815233606086015243608086015260008b81528c83529590952084518155915160018301805473ffffffffffffffffffffffffffffffffffffffff19169190941617909255925180519293926111e4926002850192019061130c565b5060608201516003828101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03938416179055608090930151600490920191909155908701805460018181018355600083815260208082209093018a90559788528981018252604080892080548084018255908a52838a20018a90559690931687526002909801885293852080549182018155855295909320909401929092555054919050565b303b1590565b600160a060020a0381166112a357600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b828054828255906000526020600020908101928215611347579160200282015b8281111561134757825182559160200191906001019061132c565b50611353929150611357565b5090565b61077a91905b80821115611353576000815560010161135d56fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582046eebc5cc190eec2e987d0c9dc8a42936a92060259b9db1ac5f87da2e953147b0029",
-  "address": "0x44665ee68779eC83202702C091279661336F5F8a",
-  "implementation": "0x9f9f7FD406160669422e945C63d836e28B8AD514",
-  "version": "v0.10.3"
-}
\ No newline at end of file
diff --git a/artifacts/ConditionStoreManager.duero.json b/artifacts/ConditionStoreManager.duero.json
deleted file mode 100644
index a1b71c0..0000000
--- a/artifacts/ConditionStoreManager.duero.json
+++ /dev/null
@@ -1,428 +0,0 @@
-{
-  "name": "ConditionStoreManager",
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "addr",
-          "type": "address"
-        }
-      ],
-      "name": "isContract",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x16279055"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getCurrentBlockNumber",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6fd902e1"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_typeRef",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_who",
-          "type": "address"
-        }
-      ],
-      "name": "ConditionCreated",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_typeRef",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_state",
-          "type": "uint8"
-        },
-        {
-          "indexed": false,
-          "name": "_who",
-          "type": "address"
-        }
-      ],
-      "name": "ConditionUpdated",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getCreateRole",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x90f1776a"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "delegatee",
-          "type": "address"
-        }
-      ],
-      "name": "delegateCreateRole",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4eea66dd"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "delegatee",
-          "type": "address"
-        }
-      ],
-      "name": "delegateUpdateRole",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xdc936bb2"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_typeRef",
-          "type": "address"
-        },
-        {
-          "name": "_timeLock",
-          "type": "uint256"
-        },
-        {
-          "name": "_timeOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "createCondition",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xfe3ae90f"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_typeRef",
-          "type": "address"
-        }
-      ],
-      "name": "createCondition",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xde43d135"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_newState",
-          "type": "uint8"
-        }
-      ],
-      "name": "updateConditionState",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x52bc0e46"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getConditionListSize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xfe6d8c46"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getCondition",
-      "outputs": [
-        {
-          "name": "typeRef",
-          "type": "address"
-        },
-        {
-          "name": "state",
-          "type": "uint8"
-        },
-        {
-          "name": "timeLock",
-          "type": "uint256"
-        },
-        {
-          "name": "timeOut",
-          "type": "uint256"
-        },
-        {
-          "name": "blockNumber",
-          "type": "uint256"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x2934a0ee"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getConditionState",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x336c5122"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "isConditionTimeLocked",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x593d00e0"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "isConditionTimedOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6ed93cc5"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b5061126c806100206000396000f3fe608060405234801561001057600080fd5b506004361061011a5760003560e060020a900480638da5cb5b116100a6578063dc936bb211610075578063dc936bb21461031a578063de43d13514610346578063f2fde38b14610372578063fe3ae90f14610398578063fe6d8c46146103d05761011a565b80638da5cb5b146102c05780638f32d59b146102e457806390f1776a146102ec578063c4d66de8146102f45761011a565b806352bc0e46116100ed57806352bc0e461461023e578063593d00e0146102645780636ed93cc5146102815780636fd902e11461029e578063715018a6146102b85761011a565b8063162790551461011f5780632934a0ee14610159578063336c5122146101d55780634eea66dd14610216575b600080fd5b6101456004803603602081101561013557600080fd5b5035600160a060020a03166103d8565b604080519115158252519081900360200190f35b6101766004803603602081101561016f57600080fd5b50356103de565b604051600160a060020a03881681526020810187600381111561019557fe5b60ff1681526020810196909652506040808601949094526060850192909252600160a060020a0316608084015260a0830152519081900360c00192509050f35b6101f2600480360360208110156101eb57600080fd5b5035610432565b6040518082600381111561020257fe5b60ff16815260200191505060405180910390f35b61023c6004803603602081101561022c57600080fd5b5035600160a060020a031661044e565b005b6101f26004803603604081101561025457600080fd5b508035906020013560ff166104df565b6101456004803603602081101561027a57600080fd5b503561063c565b6101456004803603602081101561029757600080fd5b50356106cd565b6102a661072c565b60408051918252519081900360200190f35b61023c610730565b6102c861078b565b60408051600160a060020a039092168252519081900360200190f35b61014561079a565b6102c86107ab565b61023c6004803603602081101561030a57600080fd5b5035600160a060020a03166107ba565b61023c6004803603604081101561033057600080fd5b5080359060200135600160a060020a0316610943565b6102a66004803603604081101561035c57600080fd5b5080359060200135600160a060020a0316610a4c565b61023c6004803603602081101561038857600080fd5b5035600160a060020a0316610a62565b6102a6600480360360808110156103ae57600080fd5b50803590600160a060020a036020820135169060408101359060600135610a7f565b6102a6610c66565b3b151590565b6000908152606760208181526040808420805460698452919094208054600180830154600293840154969095528601549190950154600160a060020a038084169760a060020a90940460ff16969593921691565b60009081526067602052604090205460a060020a900460ff1690565b61045661079a565b61045f57600080fd5b600160a060020a0381166104bd576040805160e560020a62461bcd02815260206004820152601960248201527f496e76616c69642064656c656761746565206164647265737300000000000000604482015290519081900360640190fd5b60668054600160a060020a031916600160a060020a0392909216919091179055565b6000828152606760205260408120548390600160a060020a0316331461054f576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420557064617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b6105588461063c565b156105ad576040805160e560020a62461bcd02815260206004820152601860248201527f54696d654c6f636b206973206e6f74206f766572207965740000000000000000604482015290519081900360640190fd5b826105b7856106cd565b156105c0575060035b60006105d46067878463ffffffff610c6c16565b90508460038111156105e257fe5b6000878152606760209081526040918290205482513381529251600160a060020a03909116928a927f1b03ca268fb2382cadcf505ee60f53857c3c2c2483f2a024c2be1073b29a63d492918290030190a495945050505050565b6000606973__EpochLibrary__________________________63f3b68c959091846040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b15801561069b57600080fd5b505af41580156106af573d6000803e3d6000fd5b505050506040513d60208110156106c557600080fd5b505192915050565b6000606973__EpochLibrary__________________________63dde77bf09091846040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b15801561069b57600080fd5b4390565b61073861079a565b61074157600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a360338054600160a060020a0319169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b606654600160a060020a031690565b600054610100900460ff16806107d357506107d3610d91565b806107e1575060005460ff16155b61081f5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611213602e913960400191505060405180910390fd5b600054610100900460ff1615801561084a576000805460ff1961ff0019909116610100171660011790555b600160a060020a0382166108a8576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b606654600160a060020a031615610909576040805160e560020a62461bcd02815260206004820152601560248201527f526f6c6520616c72656164792061737369676e65640000000000000000000000604482015290519081900360640190fd5b61091282610d97565b60668054600160a060020a031916600160a060020a038416179055801561093f576000805461ff00191690555b5050565b61094b61079a565b61095457600080fd5b600160a060020a0381166109b2576040805160e560020a62461bcd02815260206004820152601960248201527f496e76616c69642064656c656761746565206164647265737300000000000000604482015290519081900360640190fd5b600082815260676020526040902054600160a060020a0316610a1e576040805160e560020a62461bcd02815260206004820152601460248201527f496e76616c696420636f6e646974696f6e204964000000000000000000000000604482015290519081900360640190fd5b6000918252606760205260409091208054600160a060020a031916600160a060020a03909216919091179055565b6000610a5b8383600080610a7f565b9392505050565b610a6a61079a565b610a7357600080fd5b610a7c81610e8b565b50565b606654600090600160a060020a03163314610ae4576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420437265617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b83600160a060020a038116610b43576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b610b4c816103d8565b610ba0576040805160e560020a62461bcd02815260206004820152601860248201527f496e76616c696420636f6e747261637420616464726573730000000000000000604482015290519081900360640190fd5b6000610bb5606988878763ffffffff610efa16565b905080610c0c576040805160e560020a62461bcd02815260206004820152601560248201527f65706f636820776173206e6f7420637265617465640000000000000000000000604482015290519081900360640190fd5b6000610c206067898963ffffffff61109116565b6040519091503390600160a060020a038916908a907fa8370478fccea50f2f5a24a87f5539982b31df0251868c81c6cf0e35ea14f62490600090a4979650505050505050565b60685490565b6000600160008481526020869052604090205460a060020a900460ff166003811115610c9457fe5b148015610cce575060008381526020859052604090205460a060020a900460ff166003811115610cc057fe5b826003811115610ccc57fe5b115b610d22576040805160e560020a62461bcd02815260206004820152601860248201527f496e76616c6964207374617465207472616e736974696f6e0000000000000000604482015290519081900360640190fd5b6000838152602085905260409020805483919074ff0000000000000000000000000000000000000000191660a060020a836003811115610d5e57fe5b021790555050600091825260209290925260409020600181018054600160a060020a031916331790554360029091015590565b303b1590565b600054610100900460ff1680610db05750610db0610d91565b80610dbe575060005460ff16155b610dfc5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611213602e913960400191505060405180910390fd5b600054610100900460ff16158015610e27576000805460ff1961ff0019909116610100171660011790555b60338054600160a060020a031916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a3801561093f576000805461ff00191690555050565b600160a060020a038116610e9e57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a360338054600160a060020a031916600160a060020a0392909216919091179055565b60008381526020859052604081206002015415610f61576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b43610f72848263ffffffff6111db16565b10158015610f8f575043610f8c838263ffffffff6111db16565b10155b610fcd5760405160e560020a62461bcd0281526004018080602001828103825260258152602001806111ee6025913960400191505060405180910390fd5b600082118015610fdd5750600083115b1561103957818310611039576040805160e560020a62461bcd02815260206004820152601360248201527f496e76616c69642074696d65206d617267696e00000000000000000000000000604482015290519081900360640190fd5b5060408051606081018252928352602080840192835243848301908152600086815287835292832094518555925160018086019190915592516002909401939093559381018054808301825590855291909320015590565b600082815260208490526040812060020154156110f8576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b6040805160808101909152600160a060020a03831681526020810160018152336020808301919091524360409283015260008681528782529190912082518154600160a060020a031916600160a060020a0390911617808255918301519091829074ff0000000000000000000000000000000000000000191660a060020a83600381111561118257fe5b0217905550604082015160018281018054600160a060020a031916600160a060020a0390931692909217909155606090920151600290910155938401805494850181556000818152602090209094019290925550505490565b600082820183811015610a5b57600080fdfe496e6469636174696e6720696e7465676572206f766572666c6f772f756e646572666c6f77436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a723058203dfb3617864adf7450101d687e9f4843c218feba6239b6904b29fef727d857790029",
-  "address": "0xe6CeA58707df303b6d9D1DF5BA8Bf88fF4A5920D",
-  "implementation": "0xCB8F98360C71c4540a8269c6eb89Ad3a76c5f807",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/ConditionStoreManager.kovan.json b/artifacts/ConditionStoreManager.kovan.json
deleted file mode 100644
index 38c98ac..0000000
--- a/artifacts/ConditionStoreManager.kovan.json
+++ /dev/null
@@ -1,428 +0,0 @@
-{
-  "name": "ConditionStoreManager",
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "addr",
-          "type": "address"
-        }
-      ],
-      "name": "isContract",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x16279055"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getCurrentBlockNumber",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6fd902e1"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_typeRef",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_who",
-          "type": "address"
-        }
-      ],
-      "name": "ConditionCreated",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_typeRef",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_state",
-          "type": "uint8"
-        },
-        {
-          "indexed": false,
-          "name": "_who",
-          "type": "address"
-        }
-      ],
-      "name": "ConditionUpdated",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getCreateRole",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x90f1776a"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "delegatee",
-          "type": "address"
-        }
-      ],
-      "name": "delegateCreateRole",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4eea66dd"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "delegatee",
-          "type": "address"
-        }
-      ],
-      "name": "delegateUpdateRole",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xdc936bb2"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_typeRef",
-          "type": "address"
-        },
-        {
-          "name": "_timeLock",
-          "type": "uint256"
-        },
-        {
-          "name": "_timeOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "createCondition",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xfe3ae90f"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_typeRef",
-          "type": "address"
-        }
-      ],
-      "name": "createCondition",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xde43d135"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_newState",
-          "type": "uint8"
-        }
-      ],
-      "name": "updateConditionState",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x52bc0e46"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getConditionListSize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xfe6d8c46"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getCondition",
-      "outputs": [
-        {
-          "name": "typeRef",
-          "type": "address"
-        },
-        {
-          "name": "state",
-          "type": "uint8"
-        },
-        {
-          "name": "timeLock",
-          "type": "uint256"
-        },
-        {
-          "name": "timeOut",
-          "type": "uint256"
-        },
-        {
-          "name": "blockNumber",
-          "type": "uint256"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x2934a0ee"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getConditionState",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x336c5122"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "isConditionTimeLocked",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x593d00e0"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "isConditionTimedOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6ed93cc5"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b5061126c806100206000396000f3fe608060405234801561001057600080fd5b506004361061011a5760003560e060020a900480638da5cb5b116100a6578063dc936bb211610075578063dc936bb21461031a578063de43d13514610346578063f2fde38b14610372578063fe3ae90f14610398578063fe6d8c46146103d05761011a565b80638da5cb5b146102c05780638f32d59b146102e457806390f1776a146102ec578063c4d66de8146102f45761011a565b806352bc0e46116100ed57806352bc0e461461023e578063593d00e0146102645780636ed93cc5146102815780636fd902e11461029e578063715018a6146102b85761011a565b8063162790551461011f5780632934a0ee14610159578063336c5122146101d55780634eea66dd14610216575b600080fd5b6101456004803603602081101561013557600080fd5b5035600160a060020a03166103d8565b604080519115158252519081900360200190f35b6101766004803603602081101561016f57600080fd5b50356103de565b604051600160a060020a03881681526020810187600381111561019557fe5b60ff1681526020810196909652506040808601949094526060850192909252600160a060020a0316608084015260a0830152519081900360c00192509050f35b6101f2600480360360208110156101eb57600080fd5b5035610432565b6040518082600381111561020257fe5b60ff16815260200191505060405180910390f35b61023c6004803603602081101561022c57600080fd5b5035600160a060020a031661044e565b005b6101f26004803603604081101561025457600080fd5b508035906020013560ff166104df565b6101456004803603602081101561027a57600080fd5b503561063c565b6101456004803603602081101561029757600080fd5b50356106cd565b6102a661072c565b60408051918252519081900360200190f35b61023c610730565b6102c861078b565b60408051600160a060020a039092168252519081900360200190f35b61014561079a565b6102c86107ab565b61023c6004803603602081101561030a57600080fd5b5035600160a060020a03166107ba565b61023c6004803603604081101561033057600080fd5b5080359060200135600160a060020a0316610943565b6102a66004803603604081101561035c57600080fd5b5080359060200135600160a060020a0316610a4c565b61023c6004803603602081101561038857600080fd5b5035600160a060020a0316610a62565b6102a6600480360360808110156103ae57600080fd5b50803590600160a060020a036020820135169060408101359060600135610a7f565b6102a6610c66565b3b151590565b6000908152606760208181526040808420805460698452919094208054600180830154600293840154969095528601549190950154600160a060020a038084169760a060020a90940460ff16969593921691565b60009081526067602052604090205460a060020a900460ff1690565b61045661079a565b61045f57600080fd5b600160a060020a0381166104bd576040805160e560020a62461bcd02815260206004820152601960248201527f496e76616c69642064656c656761746565206164647265737300000000000000604482015290519081900360640190fd5b60668054600160a060020a031916600160a060020a0392909216919091179055565b6000828152606760205260408120548390600160a060020a0316331461054f576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420557064617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b6105588461063c565b156105ad576040805160e560020a62461bcd02815260206004820152601860248201527f54696d654c6f636b206973206e6f74206f766572207965740000000000000000604482015290519081900360640190fd5b826105b7856106cd565b156105c0575060035b60006105d46067878463ffffffff610c6c16565b90508460038111156105e257fe5b6000878152606760209081526040918290205482513381529251600160a060020a03909116928a927f1b03ca268fb2382cadcf505ee60f53857c3c2c2483f2a024c2be1073b29a63d492918290030190a495945050505050565b6000606973__EpochLibrary__________________________63f3b68c959091846040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b15801561069b57600080fd5b505af41580156106af573d6000803e3d6000fd5b505050506040513d60208110156106c557600080fd5b505192915050565b6000606973__EpochLibrary__________________________63dde77bf09091846040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b15801561069b57600080fd5b4390565b61073861079a565b61074157600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a360338054600160a060020a0319169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b606654600160a060020a031690565b600054610100900460ff16806107d357506107d3610d91565b806107e1575060005460ff16155b61081f5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611213602e913960400191505060405180910390fd5b600054610100900460ff1615801561084a576000805460ff1961ff0019909116610100171660011790555b600160a060020a0382166108a8576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b606654600160a060020a031615610909576040805160e560020a62461bcd02815260206004820152601560248201527f526f6c6520616c72656164792061737369676e65640000000000000000000000604482015290519081900360640190fd5b61091282610d97565b60668054600160a060020a031916600160a060020a038416179055801561093f576000805461ff00191690555b5050565b61094b61079a565b61095457600080fd5b600160a060020a0381166109b2576040805160e560020a62461bcd02815260206004820152601960248201527f496e76616c69642064656c656761746565206164647265737300000000000000604482015290519081900360640190fd5b600082815260676020526040902054600160a060020a0316610a1e576040805160e560020a62461bcd02815260206004820152601460248201527f496e76616c696420636f6e646974696f6e204964000000000000000000000000604482015290519081900360640190fd5b6000918252606760205260409091208054600160a060020a031916600160a060020a03909216919091179055565b6000610a5b8383600080610a7f565b9392505050565b610a6a61079a565b610a7357600080fd5b610a7c81610e8b565b50565b606654600090600160a060020a03163314610ae4576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420437265617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b83600160a060020a038116610b43576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b610b4c816103d8565b610ba0576040805160e560020a62461bcd02815260206004820152601860248201527f496e76616c696420636f6e747261637420616464726573730000000000000000604482015290519081900360640190fd5b6000610bb5606988878763ffffffff610efa16565b905080610c0c576040805160e560020a62461bcd02815260206004820152601560248201527f65706f636820776173206e6f7420637265617465640000000000000000000000604482015290519081900360640190fd5b6000610c206067898963ffffffff61109116565b6040519091503390600160a060020a038916908a907fa8370478fccea50f2f5a24a87f5539982b31df0251868c81c6cf0e35ea14f62490600090a4979650505050505050565b60685490565b6000600160008481526020869052604090205460a060020a900460ff166003811115610c9457fe5b148015610cce575060008381526020859052604090205460a060020a900460ff166003811115610cc057fe5b826003811115610ccc57fe5b115b610d22576040805160e560020a62461bcd02815260206004820152601860248201527f496e76616c6964207374617465207472616e736974696f6e0000000000000000604482015290519081900360640190fd5b6000838152602085905260409020805483919074ff0000000000000000000000000000000000000000191660a060020a836003811115610d5e57fe5b021790555050600091825260209290925260409020600181018054600160a060020a031916331790554360029091015590565b303b1590565b600054610100900460ff1680610db05750610db0610d91565b80610dbe575060005460ff16155b610dfc5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611213602e913960400191505060405180910390fd5b600054610100900460ff16158015610e27576000805460ff1961ff0019909116610100171660011790555b60338054600160a060020a031916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a3801561093f576000805461ff00191690555050565b600160a060020a038116610e9e57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a360338054600160a060020a031916600160a060020a0392909216919091179055565b60008381526020859052604081206002015415610f61576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b43610f72848263ffffffff6111db16565b10158015610f8f575043610f8c838263ffffffff6111db16565b10155b610fcd5760405160e560020a62461bcd0281526004018080602001828103825260258152602001806111ee6025913960400191505060405180910390fd5b600082118015610fdd5750600083115b1561103957818310611039576040805160e560020a62461bcd02815260206004820152601360248201527f496e76616c69642074696d65206d617267696e00000000000000000000000000604482015290519081900360640190fd5b5060408051606081018252928352602080840192835243848301908152600086815287835292832094518555925160018086019190915592516002909401939093559381018054808301825590855291909320015590565b600082815260208490526040812060020154156110f8576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b6040805160808101909152600160a060020a03831681526020810160018152336020808301919091524360409283015260008681528782529190912082518154600160a060020a031916600160a060020a0390911617808255918301519091829074ff0000000000000000000000000000000000000000191660a060020a83600381111561118257fe5b0217905550604082015160018281018054600160a060020a031916600160a060020a0390931692909217909155606090920151600290910155938401805494850181556000818152602090209094019290925550505490565b600082820183811015610a5b57600080fdfe496e6469636174696e6720696e7465676572206f766572666c6f772f756e646572666c6f77436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a723058203dfb3617864adf7450101d687e9f4843c218feba6239b6904b29fef727d857790029",
-  "address": "0xA5f5BaB34DE3782A71D37d0B334217Ded341cd64",
-  "implementation": "0x70716cFaeee2D523ee78ba6f11c6038A8Ca26EFA",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/ConditionStoreManager.mainnet.json b/artifacts/ConditionStoreManager.mainnet.json
deleted file mode 100644
index 26b42df..0000000
--- a/artifacts/ConditionStoreManager.mainnet.json
+++ /dev/null
@@ -1,428 +0,0 @@
-{
-  "name": "ConditionStoreManager",
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "addr",
-          "type": "address"
-        }
-      ],
-      "name": "isContract",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x16279055"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getCurrentBlockNumber",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6fd902e1"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_typeRef",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_who",
-          "type": "address"
-        }
-      ],
-      "name": "ConditionCreated",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_typeRef",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_state",
-          "type": "uint8"
-        },
-        {
-          "indexed": false,
-          "name": "_who",
-          "type": "address"
-        }
-      ],
-      "name": "ConditionUpdated",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getCreateRole",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x90f1776a"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "delegatee",
-          "type": "address"
-        }
-      ],
-      "name": "delegateCreateRole",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4eea66dd"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "delegatee",
-          "type": "address"
-        }
-      ],
-      "name": "delegateUpdateRole",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xdc936bb2"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_typeRef",
-          "type": "address"
-        },
-        {
-          "name": "_timeLock",
-          "type": "uint256"
-        },
-        {
-          "name": "_timeOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "createCondition",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xfe3ae90f"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_typeRef",
-          "type": "address"
-        }
-      ],
-      "name": "createCondition",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xde43d135"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_newState",
-          "type": "uint8"
-        }
-      ],
-      "name": "updateConditionState",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x52bc0e46"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getConditionListSize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xfe6d8c46"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getCondition",
-      "outputs": [
-        {
-          "name": "typeRef",
-          "type": "address"
-        },
-        {
-          "name": "state",
-          "type": "uint8"
-        },
-        {
-          "name": "timeLock",
-          "type": "uint256"
-        },
-        {
-          "name": "timeOut",
-          "type": "uint256"
-        },
-        {
-          "name": "blockNumber",
-          "type": "uint256"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x2934a0ee"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getConditionState",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x336c5122"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "isConditionTimeLocked",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x593d00e0"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "isConditionTimedOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6ed93cc5"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b5061126c806100206000396000f3fe608060405234801561001057600080fd5b506004361061011a5760003560e060020a900480638da5cb5b116100a6578063dc936bb211610075578063dc936bb21461031a578063de43d13514610346578063f2fde38b14610372578063fe3ae90f14610398578063fe6d8c46146103d05761011a565b80638da5cb5b146102c05780638f32d59b146102e457806390f1776a146102ec578063c4d66de8146102f45761011a565b806352bc0e46116100ed57806352bc0e461461023e578063593d00e0146102645780636ed93cc5146102815780636fd902e11461029e578063715018a6146102b85761011a565b8063162790551461011f5780632934a0ee14610159578063336c5122146101d55780634eea66dd14610216575b600080fd5b6101456004803603602081101561013557600080fd5b5035600160a060020a03166103d8565b604080519115158252519081900360200190f35b6101766004803603602081101561016f57600080fd5b50356103de565b604051600160a060020a03881681526020810187600381111561019557fe5b60ff1681526020810196909652506040808601949094526060850192909252600160a060020a0316608084015260a0830152519081900360c00192509050f35b6101f2600480360360208110156101eb57600080fd5b5035610432565b6040518082600381111561020257fe5b60ff16815260200191505060405180910390f35b61023c6004803603602081101561022c57600080fd5b5035600160a060020a031661044e565b005b6101f26004803603604081101561025457600080fd5b508035906020013560ff166104df565b6101456004803603602081101561027a57600080fd5b503561063c565b6101456004803603602081101561029757600080fd5b50356106cd565b6102a661072c565b60408051918252519081900360200190f35b61023c610730565b6102c861078b565b60408051600160a060020a039092168252519081900360200190f35b61014561079a565b6102c86107ab565b61023c6004803603602081101561030a57600080fd5b5035600160a060020a03166107ba565b61023c6004803603604081101561033057600080fd5b5080359060200135600160a060020a0316610943565b6102a66004803603604081101561035c57600080fd5b5080359060200135600160a060020a0316610a4c565b61023c6004803603602081101561038857600080fd5b5035600160a060020a0316610a62565b6102a6600480360360808110156103ae57600080fd5b50803590600160a060020a036020820135169060408101359060600135610a7f565b6102a6610c66565b3b151590565b6000908152606760208181526040808420805460698452919094208054600180830154600293840154969095528601549190950154600160a060020a038084169760a060020a90940460ff16969593921691565b60009081526067602052604090205460a060020a900460ff1690565b61045661079a565b61045f57600080fd5b600160a060020a0381166104bd576040805160e560020a62461bcd02815260206004820152601960248201527f496e76616c69642064656c656761746565206164647265737300000000000000604482015290519081900360640190fd5b60668054600160a060020a031916600160a060020a0392909216919091179055565b6000828152606760205260408120548390600160a060020a0316331461054f576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420557064617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b6105588461063c565b156105ad576040805160e560020a62461bcd02815260206004820152601860248201527f54696d654c6f636b206973206e6f74206f766572207965740000000000000000604482015290519081900360640190fd5b826105b7856106cd565b156105c0575060035b60006105d46067878463ffffffff610c6c16565b90508460038111156105e257fe5b6000878152606760209081526040918290205482513381529251600160a060020a03909116928a927f1b03ca268fb2382cadcf505ee60f53857c3c2c2483f2a024c2be1073b29a63d492918290030190a495945050505050565b6000606973__EpochLibrary__________________________63f3b68c959091846040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b15801561069b57600080fd5b505af41580156106af573d6000803e3d6000fd5b505050506040513d60208110156106c557600080fd5b505192915050565b6000606973__EpochLibrary__________________________63dde77bf09091846040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b15801561069b57600080fd5b4390565b61073861079a565b61074157600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a360338054600160a060020a0319169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b606654600160a060020a031690565b600054610100900460ff16806107d357506107d3610d91565b806107e1575060005460ff16155b61081f5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611213602e913960400191505060405180910390fd5b600054610100900460ff1615801561084a576000805460ff1961ff0019909116610100171660011790555b600160a060020a0382166108a8576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b606654600160a060020a031615610909576040805160e560020a62461bcd02815260206004820152601560248201527f526f6c6520616c72656164792061737369676e65640000000000000000000000604482015290519081900360640190fd5b61091282610d97565b60668054600160a060020a031916600160a060020a038416179055801561093f576000805461ff00191690555b5050565b61094b61079a565b61095457600080fd5b600160a060020a0381166109b2576040805160e560020a62461bcd02815260206004820152601960248201527f496e76616c69642064656c656761746565206164647265737300000000000000604482015290519081900360640190fd5b600082815260676020526040902054600160a060020a0316610a1e576040805160e560020a62461bcd02815260206004820152601460248201527f496e76616c696420636f6e646974696f6e204964000000000000000000000000604482015290519081900360640190fd5b6000918252606760205260409091208054600160a060020a031916600160a060020a03909216919091179055565b6000610a5b8383600080610a7f565b9392505050565b610a6a61079a565b610a7357600080fd5b610a7c81610e8b565b50565b606654600090600160a060020a03163314610ae4576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420437265617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b83600160a060020a038116610b43576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b610b4c816103d8565b610ba0576040805160e560020a62461bcd02815260206004820152601860248201527f496e76616c696420636f6e747261637420616464726573730000000000000000604482015290519081900360640190fd5b6000610bb5606988878763ffffffff610efa16565b905080610c0c576040805160e560020a62461bcd02815260206004820152601560248201527f65706f636820776173206e6f7420637265617465640000000000000000000000604482015290519081900360640190fd5b6000610c206067898963ffffffff61109116565b6040519091503390600160a060020a038916908a907fa8370478fccea50f2f5a24a87f5539982b31df0251868c81c6cf0e35ea14f62490600090a4979650505050505050565b60685490565b6000600160008481526020869052604090205460a060020a900460ff166003811115610c9457fe5b148015610cce575060008381526020859052604090205460a060020a900460ff166003811115610cc057fe5b826003811115610ccc57fe5b115b610d22576040805160e560020a62461bcd02815260206004820152601860248201527f496e76616c6964207374617465207472616e736974696f6e0000000000000000604482015290519081900360640190fd5b6000838152602085905260409020805483919074ff0000000000000000000000000000000000000000191660a060020a836003811115610d5e57fe5b021790555050600091825260209290925260409020600181018054600160a060020a031916331790554360029091015590565b303b1590565b600054610100900460ff1680610db05750610db0610d91565b80610dbe575060005460ff16155b610dfc5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611213602e913960400191505060405180910390fd5b600054610100900460ff16158015610e27576000805460ff1961ff0019909116610100171660011790555b60338054600160a060020a031916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a3801561093f576000805461ff00191690555050565b600160a060020a038116610e9e57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a360338054600160a060020a031916600160a060020a0392909216919091179055565b60008381526020859052604081206002015415610f61576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b43610f72848263ffffffff6111db16565b10158015610f8f575043610f8c838263ffffffff6111db16565b10155b610fcd5760405160e560020a62461bcd0281526004018080602001828103825260258152602001806111ee6025913960400191505060405180910390fd5b600082118015610fdd5750600083115b1561103957818310611039576040805160e560020a62461bcd02815260206004820152601360248201527f496e76616c69642074696d65206d617267696e00000000000000000000000000604482015290519081900360640190fd5b5060408051606081018252928352602080840192835243848301908152600086815287835292832094518555925160018086019190915592516002909401939093559381018054808301825590855291909320015590565b600082815260208490526040812060020154156110f8576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b6040805160808101909152600160a060020a03831681526020810160018152336020808301919091524360409283015260008681528782529190912082518154600160a060020a031916600160a060020a0390911617808255918301519091829074ff0000000000000000000000000000000000000000191660a060020a83600381111561118257fe5b0217905550604082015160018281018054600160a060020a031916600160a060020a0390931692909217909155606090920151600290910155938401805494850181556000818152602090209094019290925550505490565b600082820183811015610a5b57600080fdfe496e6469636174696e6720696e7465676572206f766572666c6f772f756e646572666c6f77436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a723058203dfb3617864adf7450101d687e9f4843c218feba6239b6904b29fef727d857790029",
-  "address": "0x031A0B2FE74086e5963CD5Ac27Bd1451A40Fe593",
-  "implementation": "0x3B699FC973C8Dbe484f5C3cE7b3FF68bEA0c1D8A",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/ConditionStoreManager.nile.json b/artifacts/ConditionStoreManager.nile.json
deleted file mode 100644
index 0e89bdd..0000000
--- a/artifacts/ConditionStoreManager.nile.json
+++ /dev/null
@@ -1,428 +0,0 @@
-{
-  "name": "ConditionStoreManager",
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "addr",
-          "type": "address"
-        }
-      ],
-      "name": "isContract",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x16279055"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getCurrentBlockNumber",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6fd902e1"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_typeRef",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_who",
-          "type": "address"
-        }
-      ],
-      "name": "ConditionCreated",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_typeRef",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_state",
-          "type": "uint8"
-        },
-        {
-          "indexed": false,
-          "name": "_who",
-          "type": "address"
-        }
-      ],
-      "name": "ConditionUpdated",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getCreateRole",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x90f1776a"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "delegatee",
-          "type": "address"
-        }
-      ],
-      "name": "delegateCreateRole",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4eea66dd"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "delegatee",
-          "type": "address"
-        }
-      ],
-      "name": "delegateUpdateRole",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xdc936bb2"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_typeRef",
-          "type": "address"
-        },
-        {
-          "name": "_timeLock",
-          "type": "uint256"
-        },
-        {
-          "name": "_timeOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "createCondition",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xfe3ae90f"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_typeRef",
-          "type": "address"
-        }
-      ],
-      "name": "createCondition",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xde43d135"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_newState",
-          "type": "uint8"
-        }
-      ],
-      "name": "updateConditionState",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x52bc0e46"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getConditionListSize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xfe6d8c46"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getCondition",
-      "outputs": [
-        {
-          "name": "typeRef",
-          "type": "address"
-        },
-        {
-          "name": "state",
-          "type": "uint8"
-        },
-        {
-          "name": "timeLock",
-          "type": "uint256"
-        },
-        {
-          "name": "timeOut",
-          "type": "uint256"
-        },
-        {
-          "name": "blockNumber",
-          "type": "uint256"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x2934a0ee"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getConditionState",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x336c5122"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "isConditionTimeLocked",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x593d00e0"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "isConditionTimedOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6ed93cc5"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b5061126c806100206000396000f3fe608060405234801561001057600080fd5b506004361061011a5760003560e060020a900480638da5cb5b116100a6578063dc936bb211610075578063dc936bb21461031a578063de43d13514610346578063f2fde38b14610372578063fe3ae90f14610398578063fe6d8c46146103d05761011a565b80638da5cb5b146102c05780638f32d59b146102e457806390f1776a146102ec578063c4d66de8146102f45761011a565b806352bc0e46116100ed57806352bc0e461461023e578063593d00e0146102645780636ed93cc5146102815780636fd902e11461029e578063715018a6146102b85761011a565b8063162790551461011f5780632934a0ee14610159578063336c5122146101d55780634eea66dd14610216575b600080fd5b6101456004803603602081101561013557600080fd5b5035600160a060020a03166103d8565b604080519115158252519081900360200190f35b6101766004803603602081101561016f57600080fd5b50356103de565b604051600160a060020a03881681526020810187600381111561019557fe5b60ff1681526020810196909652506040808601949094526060850192909252600160a060020a0316608084015260a0830152519081900360c00192509050f35b6101f2600480360360208110156101eb57600080fd5b5035610432565b6040518082600381111561020257fe5b60ff16815260200191505060405180910390f35b61023c6004803603602081101561022c57600080fd5b5035600160a060020a031661044e565b005b6101f26004803603604081101561025457600080fd5b508035906020013560ff166104df565b6101456004803603602081101561027a57600080fd5b503561063c565b6101456004803603602081101561029757600080fd5b50356106cd565b6102a661072c565b60408051918252519081900360200190f35b61023c610730565b6102c861078b565b60408051600160a060020a039092168252519081900360200190f35b61014561079a565b6102c86107ab565b61023c6004803603602081101561030a57600080fd5b5035600160a060020a03166107ba565b61023c6004803603604081101561033057600080fd5b5080359060200135600160a060020a0316610943565b6102a66004803603604081101561035c57600080fd5b5080359060200135600160a060020a0316610a4c565b61023c6004803603602081101561038857600080fd5b5035600160a060020a0316610a62565b6102a6600480360360808110156103ae57600080fd5b50803590600160a060020a036020820135169060408101359060600135610a7f565b6102a6610c66565b3b151590565b6000908152606760208181526040808420805460698452919094208054600180830154600293840154969095528601549190950154600160a060020a038084169760a060020a90940460ff16969593921691565b60009081526067602052604090205460a060020a900460ff1690565b61045661079a565b61045f57600080fd5b600160a060020a0381166104bd576040805160e560020a62461bcd02815260206004820152601960248201527f496e76616c69642064656c656761746565206164647265737300000000000000604482015290519081900360640190fd5b60668054600160a060020a031916600160a060020a0392909216919091179055565b6000828152606760205260408120548390600160a060020a0316331461054f576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420557064617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b6105588461063c565b156105ad576040805160e560020a62461bcd02815260206004820152601860248201527f54696d654c6f636b206973206e6f74206f766572207965740000000000000000604482015290519081900360640190fd5b826105b7856106cd565b156105c0575060035b60006105d46067878463ffffffff610c6c16565b90508460038111156105e257fe5b6000878152606760209081526040918290205482513381529251600160a060020a03909116928a927f1b03ca268fb2382cadcf505ee60f53857c3c2c2483f2a024c2be1073b29a63d492918290030190a495945050505050565b6000606973__EpochLibrary__________________________63f3b68c959091846040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b15801561069b57600080fd5b505af41580156106af573d6000803e3d6000fd5b505050506040513d60208110156106c557600080fd5b505192915050565b6000606973__EpochLibrary__________________________63dde77bf09091846040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b15801561069b57600080fd5b4390565b61073861079a565b61074157600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a360338054600160a060020a0319169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b606654600160a060020a031690565b600054610100900460ff16806107d357506107d3610d91565b806107e1575060005460ff16155b61081f5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611213602e913960400191505060405180910390fd5b600054610100900460ff1615801561084a576000805460ff1961ff0019909116610100171660011790555b600160a060020a0382166108a8576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b606654600160a060020a031615610909576040805160e560020a62461bcd02815260206004820152601560248201527f526f6c6520616c72656164792061737369676e65640000000000000000000000604482015290519081900360640190fd5b61091282610d97565b60668054600160a060020a031916600160a060020a038416179055801561093f576000805461ff00191690555b5050565b61094b61079a565b61095457600080fd5b600160a060020a0381166109b2576040805160e560020a62461bcd02815260206004820152601960248201527f496e76616c69642064656c656761746565206164647265737300000000000000604482015290519081900360640190fd5b600082815260676020526040902054600160a060020a0316610a1e576040805160e560020a62461bcd02815260206004820152601460248201527f496e76616c696420636f6e646974696f6e204964000000000000000000000000604482015290519081900360640190fd5b6000918252606760205260409091208054600160a060020a031916600160a060020a03909216919091179055565b6000610a5b8383600080610a7f565b9392505050565b610a6a61079a565b610a7357600080fd5b610a7c81610e8b565b50565b606654600090600160a060020a03163314610ae4576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420437265617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b83600160a060020a038116610b43576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b610b4c816103d8565b610ba0576040805160e560020a62461bcd02815260206004820152601860248201527f496e76616c696420636f6e747261637420616464726573730000000000000000604482015290519081900360640190fd5b6000610bb5606988878763ffffffff610efa16565b905080610c0c576040805160e560020a62461bcd02815260206004820152601560248201527f65706f636820776173206e6f7420637265617465640000000000000000000000604482015290519081900360640190fd5b6000610c206067898963ffffffff61109116565b6040519091503390600160a060020a038916908a907fa8370478fccea50f2f5a24a87f5539982b31df0251868c81c6cf0e35ea14f62490600090a4979650505050505050565b60685490565b6000600160008481526020869052604090205460a060020a900460ff166003811115610c9457fe5b148015610cce575060008381526020859052604090205460a060020a900460ff166003811115610cc057fe5b826003811115610ccc57fe5b115b610d22576040805160e560020a62461bcd02815260206004820152601860248201527f496e76616c6964207374617465207472616e736974696f6e0000000000000000604482015290519081900360640190fd5b6000838152602085905260409020805483919074ff0000000000000000000000000000000000000000191660a060020a836003811115610d5e57fe5b021790555050600091825260209290925260409020600181018054600160a060020a031916331790554360029091015590565b303b1590565b600054610100900460ff1680610db05750610db0610d91565b80610dbe575060005460ff16155b610dfc5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611213602e913960400191505060405180910390fd5b600054610100900460ff16158015610e27576000805460ff1961ff0019909116610100171660011790555b60338054600160a060020a031916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a3801561093f576000805461ff00191690555050565b600160a060020a038116610e9e57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a360338054600160a060020a031916600160a060020a0392909216919091179055565b60008381526020859052604081206002015415610f61576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b43610f72848263ffffffff6111db16565b10158015610f8f575043610f8c838263ffffffff6111db16565b10155b610fcd5760405160e560020a62461bcd0281526004018080602001828103825260258152602001806111ee6025913960400191505060405180910390fd5b600082118015610fdd5750600083115b1561103957818310611039576040805160e560020a62461bcd02815260206004820152601360248201527f496e76616c69642074696d65206d617267696e00000000000000000000000000604482015290519081900360640190fd5b5060408051606081018252928352602080840192835243848301908152600086815287835292832094518555925160018086019190915592516002909401939093559381018054808301825590855291909320015590565b600082815260208490526040812060020154156110f8576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b6040805160808101909152600160a060020a03831681526020810160018152336020808301919091524360409283015260008681528782529190912082518154600160a060020a031916600160a060020a0390911617808255918301519091829074ff0000000000000000000000000000000000000000191660a060020a83600381111561118257fe5b0217905550604082015160018281018054600160a060020a031916600160a060020a0390931692909217909155606090920151600290910155938401805494850181556000818152602090209094019290925550505490565b600082820183811015610a5b57600080fdfe496e6469636174696e6720696e7465676572206f766572666c6f772f756e646572666c6f77436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a723058203dfb3617864adf7450101d687e9f4843c218feba6239b6904b29fef727d857790029",
-  "address": "0x39b0AA775496C5ebf26f3B81C9ed1843f09eE466",
-  "implementation": "0x50DE7DD6edf3CA41150598640C89fd3a0a4dF29E",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/ConditionStoreManager.pacific.json b/artifacts/ConditionStoreManager.pacific.json
deleted file mode 100644
index 8f0ef21..0000000
--- a/artifacts/ConditionStoreManager.pacific.json
+++ /dev/null
@@ -1,428 +0,0 @@
-{
-  "name": "ConditionStoreManager",
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "addr",
-          "type": "address"
-        }
-      ],
-      "name": "isContract",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x16279055"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getCurrentBlockNumber",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6fd902e1"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_typeRef",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_who",
-          "type": "address"
-        }
-      ],
-      "name": "ConditionCreated",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_typeRef",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_state",
-          "type": "uint8"
-        },
-        {
-          "indexed": false,
-          "name": "_who",
-          "type": "address"
-        }
-      ],
-      "name": "ConditionUpdated",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getCreateRole",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x90f1776a"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "delegatee",
-          "type": "address"
-        }
-      ],
-      "name": "delegateCreateRole",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4eea66dd"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "delegatee",
-          "type": "address"
-        }
-      ],
-      "name": "delegateUpdateRole",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xdc936bb2"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_typeRef",
-          "type": "address"
-        },
-        {
-          "name": "_timeLock",
-          "type": "uint256"
-        },
-        {
-          "name": "_timeOut",
-          "type": "uint256"
-        }
-      ],
-      "name": "createCondition",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xfe3ae90f"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_typeRef",
-          "type": "address"
-        }
-      ],
-      "name": "createCondition",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xde43d135"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_newState",
-          "type": "uint8"
-        }
-      ],
-      "name": "updateConditionState",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x52bc0e46"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getConditionListSize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xfe6d8c46"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getCondition",
-      "outputs": [
-        {
-          "name": "typeRef",
-          "type": "address"
-        },
-        {
-          "name": "state",
-          "type": "uint8"
-        },
-        {
-          "name": "timeLock",
-          "type": "uint256"
-        },
-        {
-          "name": "timeOut",
-          "type": "uint256"
-        },
-        {
-          "name": "blockNumber",
-          "type": "uint256"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x2934a0ee"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getConditionState",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x336c5122"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "isConditionTimeLocked",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x593d00e0"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "isConditionTimedOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6ed93cc5"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b5061126c806100206000396000f3fe608060405234801561001057600080fd5b506004361061011a5760003560e060020a900480638da5cb5b116100a6578063dc936bb211610075578063dc936bb21461031a578063de43d13514610346578063f2fde38b14610372578063fe3ae90f14610398578063fe6d8c46146103d05761011a565b80638da5cb5b146102c05780638f32d59b146102e457806390f1776a146102ec578063c4d66de8146102f45761011a565b806352bc0e46116100ed57806352bc0e461461023e578063593d00e0146102645780636ed93cc5146102815780636fd902e11461029e578063715018a6146102b85761011a565b8063162790551461011f5780632934a0ee14610159578063336c5122146101d55780634eea66dd14610216575b600080fd5b6101456004803603602081101561013557600080fd5b5035600160a060020a03166103d8565b604080519115158252519081900360200190f35b6101766004803603602081101561016f57600080fd5b50356103de565b604051600160a060020a03881681526020810187600381111561019557fe5b60ff1681526020810196909652506040808601949094526060850192909252600160a060020a0316608084015260a0830152519081900360c00192509050f35b6101f2600480360360208110156101eb57600080fd5b5035610432565b6040518082600381111561020257fe5b60ff16815260200191505060405180910390f35b61023c6004803603602081101561022c57600080fd5b5035600160a060020a031661044e565b005b6101f26004803603604081101561025457600080fd5b508035906020013560ff166104df565b6101456004803603602081101561027a57600080fd5b503561063c565b6101456004803603602081101561029757600080fd5b50356106cd565b6102a661072c565b60408051918252519081900360200190f35b61023c610730565b6102c861078b565b60408051600160a060020a039092168252519081900360200190f35b61014561079a565b6102c86107ab565b61023c6004803603602081101561030a57600080fd5b5035600160a060020a03166107ba565b61023c6004803603604081101561033057600080fd5b5080359060200135600160a060020a0316610943565b6102a66004803603604081101561035c57600080fd5b5080359060200135600160a060020a0316610a4c565b61023c6004803603602081101561038857600080fd5b5035600160a060020a0316610a62565b6102a6600480360360808110156103ae57600080fd5b50803590600160a060020a036020820135169060408101359060600135610a7f565b6102a6610c66565b3b151590565b6000908152606760208181526040808420805460698452919094208054600180830154600293840154969095528601549190950154600160a060020a038084169760a060020a90940460ff16969593921691565b60009081526067602052604090205460a060020a900460ff1690565b61045661079a565b61045f57600080fd5b600160a060020a0381166104bd576040805160e560020a62461bcd02815260206004820152601960248201527f496e76616c69642064656c656761746565206164647265737300000000000000604482015290519081900360640190fd5b60668054600160a060020a031916600160a060020a0392909216919091179055565b6000828152606760205260408120548390600160a060020a0316331461054f576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420557064617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b6105588461063c565b156105ad576040805160e560020a62461bcd02815260206004820152601860248201527f54696d654c6f636b206973206e6f74206f766572207965740000000000000000604482015290519081900360640190fd5b826105b7856106cd565b156105c0575060035b60006105d46067878463ffffffff610c6c16565b90508460038111156105e257fe5b6000878152606760209081526040918290205482513381529251600160a060020a03909116928a927f1b03ca268fb2382cadcf505ee60f53857c3c2c2483f2a024c2be1073b29a63d492918290030190a495945050505050565b6000606973__EpochLibrary__________________________63f3b68c959091846040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b15801561069b57600080fd5b505af41580156106af573d6000803e3d6000fd5b505050506040513d60208110156106c557600080fd5b505192915050565b6000606973__EpochLibrary__________________________63dde77bf09091846040518363ffffffff1660e060020a028152600401808381526020018281526020019250505060206040518083038186803b15801561069b57600080fd5b4390565b61073861079a565b61074157600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a360338054600160a060020a0319169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b606654600160a060020a031690565b600054610100900460ff16806107d357506107d3610d91565b806107e1575060005460ff16155b61081f5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611213602e913960400191505060405180910390fd5b600054610100900460ff1615801561084a576000805460ff1961ff0019909116610100171660011790555b600160a060020a0382166108a8576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b606654600160a060020a031615610909576040805160e560020a62461bcd02815260206004820152601560248201527f526f6c6520616c72656164792061737369676e65640000000000000000000000604482015290519081900360640190fd5b61091282610d97565b60668054600160a060020a031916600160a060020a038416179055801561093f576000805461ff00191690555b5050565b61094b61079a565b61095457600080fd5b600160a060020a0381166109b2576040805160e560020a62461bcd02815260206004820152601960248201527f496e76616c69642064656c656761746565206164647265737300000000000000604482015290519081900360640190fd5b600082815260676020526040902054600160a060020a0316610a1e576040805160e560020a62461bcd02815260206004820152601460248201527f496e76616c696420636f6e646974696f6e204964000000000000000000000000604482015290519081900360640190fd5b6000918252606760205260409091208054600160a060020a031916600160a060020a03909216919091179055565b6000610a5b8383600080610a7f565b9392505050565b610a6a61079a565b610a7357600080fd5b610a7c81610e8b565b50565b606654600090600160a060020a03163314610ae4576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420437265617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b83600160a060020a038116610b43576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b610b4c816103d8565b610ba0576040805160e560020a62461bcd02815260206004820152601860248201527f496e76616c696420636f6e747261637420616464726573730000000000000000604482015290519081900360640190fd5b6000610bb5606988878763ffffffff610efa16565b905080610c0c576040805160e560020a62461bcd02815260206004820152601560248201527f65706f636820776173206e6f7420637265617465640000000000000000000000604482015290519081900360640190fd5b6000610c206067898963ffffffff61109116565b6040519091503390600160a060020a038916908a907fa8370478fccea50f2f5a24a87f5539982b31df0251868c81c6cf0e35ea14f62490600090a4979650505050505050565b60685490565b6000600160008481526020869052604090205460a060020a900460ff166003811115610c9457fe5b148015610cce575060008381526020859052604090205460a060020a900460ff166003811115610cc057fe5b826003811115610ccc57fe5b115b610d22576040805160e560020a62461bcd02815260206004820152601860248201527f496e76616c6964207374617465207472616e736974696f6e0000000000000000604482015290519081900360640190fd5b6000838152602085905260409020805483919074ff0000000000000000000000000000000000000000191660a060020a836003811115610d5e57fe5b021790555050600091825260209290925260409020600181018054600160a060020a031916331790554360029091015590565b303b1590565b600054610100900460ff1680610db05750610db0610d91565b80610dbe575060005460ff16155b610dfc5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611213602e913960400191505060405180910390fd5b600054610100900460ff16158015610e27576000805460ff1961ff0019909116610100171660011790555b60338054600160a060020a031916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a3801561093f576000805461ff00191690555050565b600160a060020a038116610e9e57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a360338054600160a060020a031916600160a060020a0392909216919091179055565b60008381526020859052604081206002015415610f61576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b43610f72848263ffffffff6111db16565b10158015610f8f575043610f8c838263ffffffff6111db16565b10155b610fcd5760405160e560020a62461bcd0281526004018080602001828103825260258152602001806111ee6025913960400191505060405180910390fd5b600082118015610fdd5750600083115b1561103957818310611039576040805160e560020a62461bcd02815260206004820152601360248201527f496e76616c69642074696d65206d617267696e00000000000000000000000000604482015290519081900360640190fd5b5060408051606081018252928352602080840192835243848301908152600086815287835292832094518555925160018086019190915592516002909401939093559381018054808301825590855291909320015590565b600082815260208490526040812060020154156110f8576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b6040805160808101909152600160a060020a03831681526020810160018152336020808301919091524360409283015260008681528782529190912082518154600160a060020a031916600160a060020a0390911617808255918301519091829074ff0000000000000000000000000000000000000000191660a060020a83600381111561118257fe5b0217905550604082015160018281018054600160a060020a031916600160a060020a0390931692909217909155606090920151600290910155938401805494850181556000818152602090209094019290925550505490565b600082820183811015610a5b57600080fdfe496e6469636174696e6720696e7465676572206f766572666c6f772f756e646572666c6f77436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a723058203dfb3617864adf7450101d687e9f4843c218feba6239b6904b29fef727d857790029",
-  "address": "0xbD1dEd7ef05c31F81C54e913a23Da69E77d3e0EE",
-  "implementation": "0x9408feffc865B6EBC7DB0E53ceb0b19D691f7e1B",
-  "version": "v0.10.3"
-}
\ No newline at end of file
diff --git a/artifacts/DIDRegistry.duero.json b/artifacts/DIDRegistry.duero.json
deleted file mode 100644
index 0a6487a..0000000
--- a/artifacts/DIDRegistry.duero.json
+++ /dev/null
@@ -1,372 +0,0 @@
-{
-  "name": "DIDRegistry",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_checksum",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_value",
-          "type": "string"
-        },
-        {
-          "indexed": false,
-          "name": "_lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "name": "DIDAttributeRegistered",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_provider",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "state",
-          "type": "bool"
-        }
-      ],
-      "name": "DIDProviderRemoved",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "DIDProviderAdded",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_checksum",
-          "type": "bytes32"
-        },
-        {
-          "name": "_providers",
-          "type": "address[]"
-        },
-        {
-          "name": "_value",
-          "type": "string"
-        }
-      ],
-      "name": "registerAttribute",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x534eb706"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "addDIDProvider",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa2d28d46"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "removeDIDProvider",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x7ac5f7c8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "isDIDProvider",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x3c6aa7b7"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getDIDRegister",
-      "outputs": [
-        {
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "name": "lastChecksum",
-          "type": "bytes32"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        },
-        {
-          "name": "providers",
-          "type": "address[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x22c6b519"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getBlockNumberUpdated",
-      "outputs": [
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xbbc1dede"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getDIDOwner",
-      "outputs": [
-        {
-          "name": "didOwner",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6c2ef524"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getDIDRegistrySize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x39c035f0"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getDIDRegisterIds",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x70c6817a"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50611193806100206000396000f3fe608060405234801561001057600080fd5b5060043610610107576000357c0100000000000000000000000000000000000000000000000000000000900480637ac5f7c8116100a9578063a2d28d4611610083578063a2d28d4614610424578063bbc1dede14610450578063c4d66de81461046d578063f2fde38b1461049357610107565b80637ac5f7c8146103e85780638da5cb5b146104145780638f32d59b1461041c57610107565b8063534eb706116100e5578063534eb706146102175780636c2ef5241461034d57806370c6817a14610386578063715018a6146103de57610107565b806322c6b5191461010c57806339c035f0146101bd5780633c6aa7b7146101d7575b600080fd5b6101296004803603602081101561012257600080fd5b50356104b9565b6040518086600160a060020a0316600160a060020a0316815260200185815260200184600160a060020a0316600160a060020a0316815260200183815260200180602001828103825283818151815260200191508051906020019060200280838360005b838110156101a557818101518382015260200161018d565b50505050905001965050505050505060405180910390f35b6101c5610553565b60408051918252519081900360200190f35b610203600480360360408110156101ed57600080fd5b5080359060200135600160a060020a0316610559565b604080519115158252519081900360200190f35b6101c56004803603608081101561022d57600080fd5b81359160208101359181019060608101604082013564010000000081111561025457600080fd5b82018360208201111561026657600080fd5b8035906020019184602083028401116401000000008311171561028857600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156102d857600080fd5b8201836020820111156102ea57600080fd5b8035906020019184600183028401116401000000008311171561030c57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610611945050505050565b61036a6004803603602081101561036357600080fd5b50356108fd565b60408051600160a060020a039092168252519081900360200190f35b61038e610918565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156103ca5781810151838201526020016103b2565b505050509050019250505060405180910390f35b6103e6610973565b005b6103e6600480360360408110156103fe57600080fd5b5080359060200135600160a060020a03166109db565b61036a610ab2565b610203610ac1565b6103e66004803603604081101561043a57600080fd5b5080359060200135600160a060020a0316610ad2565b6101c56004803603602081101561046657600080fd5b5035610bf6565b6103e66004803603602081101561048357600080fd5b5035600160a060020a0316610c0b565b6103e6600480360360208110156104a957600080fd5b5035600160a060020a0316610cba565b600081815260666020908152604091829020805460018201546002830154600384015460049094018054875181880281018801909852808852600160a060020a039485169793969290941694936060939283018282801561054357602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610525575b5050505050905091939590929450565b60675490565b604080517ffc977f2f0000000000000000000000000000000000000000000000000000000081526066600482015260248101849052600160a060020a0383166044820152905160009173__DIDRegistryLibrary____________________9163fc977f2f91606480820192602092909190829003018186803b1580156105de57600080fd5b505af41580156105f2573d6000803e3d6000fd5b505050506040513d602081101561060857600080fd5b50519392505050565b600084815260666020526040812054600160a060020a0316158061064b5750600085815260666020526040902054600160a060020a031633145b6106895760405160e560020a62461bcd02815260040180806020018281038252603081526020018061110a6030913960400191505060405180910390fd5b610800825111156106e4576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c69642076616c75652073697a650000000000000000000000000000604482015290519081900360640190fd5b604080517f36e2d0c9000000000000000000000000000000000000000000000000000000008152606660048201526024810187905260448101869052905160009173__DIDRegistryLibrary____________________916336e2d0c991606480820192602092909190829003018186803b15801561076157600080fd5b505af4158015610775573d6000803e3d6000fd5b505050506040513d602081101561078b57600080fd5b5051905060005b84518110156108265760006107c6888784815181106107ad57fe5b60200260200101516066610cd79092919063ffffffff16565b90508061081d576040805160e560020a62461bcd02815260206004820152601660248201527f70726f766964657220776173206e6f7420616464656400000000000000000000604482015290519081900360640190fd5b50600101610792565b5060008681526066602090815260408083205481513381850181905243938201849052606080835289519083015288518b96600160a060020a03909416958d957f8f8b755e50eb4efaa1a82e62cbfe4c58d83374b2f20db5960764ba69e062ae43958c959193919283926080840192918801918190849084905b838110156108b85781810151838201526020016108a0565b50505050905090810190601f1680156108e55780820380516001836020036101000a031916815260200191505b5094505050505060405180910390a495945050505050565b600090815260666020526040902054600160a060020a031690565b6060606660010180548060200260200160405190810160405280929190818152602001828054801561096957602002820191906000526020600020905b815481526020019060010190808311610955575b5050505050905090565b61097b610ac1565b61098457600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b6000828152606660205260409020548290600160a060020a03163314610a4b576040805160e560020a62461bcd02815260206004820152601160248201527f496e76616c696420444944206f776e6572000000000000000000000000000000604482015290519081900360640190fd5b6000610a5f6066858563ffffffff610de216565b60408051868152600160a060020a03861660208201528215158183015290519192507fa34c94e3893406b9fa302e5fbe4335b0cc46ca311d7ea24545426ec223a94f41919081900360600190a150505050565b603354600160a060020a031690565b603354600160a060020a0316331490565b6000828152606660205260409020548290600160a060020a03163314610b42576040805160e560020a62461bcd02815260206004820152601160248201527f496e76616c696420444944206f776e6572000000000000000000000000000000604482015290519081900360640190fd5b6000610b566066858563ffffffff610cd716565b905080610bad576040805160e560020a62461bcd02815260206004820152601660248201527f70726f766964657220776173206e6f7420616464656400000000000000000000604482015290519081900360640190fd5b60408051858152600160a060020a038516602082015281517f0c22bba9f36f0f2a7884650bedf42ce7b026851b573c93e4d8cd51f73eceda0f929181900390910190a150505050565b60009081526066602052604090206003015490565b600054610100900460ff1680610c245750610c24610eb3565b80610c32575060005460ff16155b610c705760405160e560020a62461bcd02815260040180806020018281038252602e81526020018061113a602e913960400191505060405180910390fd5b600054610100900460ff16158015610c9b576000805460ff1961ff0019909116610100171660011790555b610ca482610eb9565b8015610cb6576000805461ff00191690555b5050565b610cc2610ac1565b610ccb57600080fd5b610cd481610fba565b50565b6000600160a060020a038216610d37576040805160e560020a62461bcd02815260206004820152601e60248201527f496e76616c69642061737365742070726f766964657220616464726573730000604482015290519081900360640190fd5b600160a060020a038216301415610d825760405160e560020a62461bcd0281526004018080602001828103825260308152602001806110da6030913960400191505060405180910390fd5b610d8d848484611036565b610dd75760008381526020858152604082206004018054600181018255908352912001805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384161790555b5060015b9392505050565b6000600160a060020a038216610e42576040805160e560020a62461bcd02815260206004820152601e60248201527f496e76616c69642061737365742070726f766964657220616464726573730000604482015290519081900360640190fd5b6000610e4f858585611065565b9050806000191415610e65576000915050610ddb565b6000848152602086905260409020600401805482908110610e8257fe5b6000918252602090912001805473ffffffffffffffffffffffffffffffffffffffff19169055506001949350505050565b303b1590565b600054610100900460ff1680610ed25750610ed2610eb3565b80610ee0575060005460ff16155b610f1e5760405160e560020a62461bcd02815260040180806020018281038252602e81526020018061113a602e913960400191505060405180910390fd5b600054610100900460ff16158015610f49576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610cb6576000805461ff00191690555050565b600160a060020a038116610fcd57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b600080611044858585611065565b905080600019141561105a576000915050610ddb565b506001949350505050565b6000805b6000848152602086905260409020600401548110156110cd57600084815260208690526040902060040180548290811061109f57fe5b600091825260209091200154600160a060020a03848116911614156110c5579050610ddb565b600101611069565b5060001994935050505056fe4449442070726f76696465722073686f756c64206e6f74206265207468697320636f6e7472616374206164647265737341747472696275746573206d75737420626520726567697374657265642062792074686520444944206f776e6572732e436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582094de876c87e7581383335a419e2764fc97b93e222225f82baf45242da15413f50029",
-  "address": "0x4878e1dfd4105b8FF3A879C5896495d5DE3274B5",
-  "implementation": "0x80Da1025c0091A68b20D35fa4E35b022a0EFDf71",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/DIDRegistry.kovan.json b/artifacts/DIDRegistry.kovan.json
deleted file mode 100644
index 1f6fec8..0000000
--- a/artifacts/DIDRegistry.kovan.json
+++ /dev/null
@@ -1,372 +0,0 @@
-{
-  "name": "DIDRegistry",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_checksum",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_value",
-          "type": "string"
-        },
-        {
-          "indexed": false,
-          "name": "_lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "name": "DIDAttributeRegistered",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_provider",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "state",
-          "type": "bool"
-        }
-      ],
-      "name": "DIDProviderRemoved",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "DIDProviderAdded",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_checksum",
-          "type": "bytes32"
-        },
-        {
-          "name": "_providers",
-          "type": "address[]"
-        },
-        {
-          "name": "_value",
-          "type": "string"
-        }
-      ],
-      "name": "registerAttribute",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x534eb706"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "addDIDProvider",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa2d28d46"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "removeDIDProvider",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x7ac5f7c8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "isDIDProvider",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x3c6aa7b7"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getDIDRegister",
-      "outputs": [
-        {
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "name": "lastChecksum",
-          "type": "bytes32"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        },
-        {
-          "name": "providers",
-          "type": "address[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x22c6b519"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getBlockNumberUpdated",
-      "outputs": [
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xbbc1dede"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getDIDOwner",
-      "outputs": [
-        {
-          "name": "didOwner",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6c2ef524"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getDIDRegistrySize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x39c035f0"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getDIDRegisterIds",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x70c6817a"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50611193806100206000396000f3fe608060405234801561001057600080fd5b5060043610610107576000357c0100000000000000000000000000000000000000000000000000000000900480637ac5f7c8116100a9578063a2d28d4611610083578063a2d28d4614610424578063bbc1dede14610450578063c4d66de81461046d578063f2fde38b1461049357610107565b80637ac5f7c8146103e85780638da5cb5b146104145780638f32d59b1461041c57610107565b8063534eb706116100e5578063534eb706146102175780636c2ef5241461034d57806370c6817a14610386578063715018a6146103de57610107565b806322c6b5191461010c57806339c035f0146101bd5780633c6aa7b7146101d7575b600080fd5b6101296004803603602081101561012257600080fd5b50356104b9565b6040518086600160a060020a0316600160a060020a0316815260200185815260200184600160a060020a0316600160a060020a0316815260200183815260200180602001828103825283818151815260200191508051906020019060200280838360005b838110156101a557818101518382015260200161018d565b50505050905001965050505050505060405180910390f35b6101c5610553565b60408051918252519081900360200190f35b610203600480360360408110156101ed57600080fd5b5080359060200135600160a060020a0316610559565b604080519115158252519081900360200190f35b6101c56004803603608081101561022d57600080fd5b81359160208101359181019060608101604082013564010000000081111561025457600080fd5b82018360208201111561026657600080fd5b8035906020019184602083028401116401000000008311171561028857600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156102d857600080fd5b8201836020820111156102ea57600080fd5b8035906020019184600183028401116401000000008311171561030c57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610611945050505050565b61036a6004803603602081101561036357600080fd5b50356108fd565b60408051600160a060020a039092168252519081900360200190f35b61038e610918565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156103ca5781810151838201526020016103b2565b505050509050019250505060405180910390f35b6103e6610973565b005b6103e6600480360360408110156103fe57600080fd5b5080359060200135600160a060020a03166109db565b61036a610ab2565b610203610ac1565b6103e66004803603604081101561043a57600080fd5b5080359060200135600160a060020a0316610ad2565b6101c56004803603602081101561046657600080fd5b5035610bf6565b6103e66004803603602081101561048357600080fd5b5035600160a060020a0316610c0b565b6103e6600480360360208110156104a957600080fd5b5035600160a060020a0316610cba565b600081815260666020908152604091829020805460018201546002830154600384015460049094018054875181880281018801909852808852600160a060020a039485169793969290941694936060939283018282801561054357602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610525575b5050505050905091939590929450565b60675490565b604080517ffc977f2f0000000000000000000000000000000000000000000000000000000081526066600482015260248101849052600160a060020a0383166044820152905160009173__DIDRegistryLibrary____________________9163fc977f2f91606480820192602092909190829003018186803b1580156105de57600080fd5b505af41580156105f2573d6000803e3d6000fd5b505050506040513d602081101561060857600080fd5b50519392505050565b600084815260666020526040812054600160a060020a0316158061064b5750600085815260666020526040902054600160a060020a031633145b6106895760405160e560020a62461bcd02815260040180806020018281038252603081526020018061110a6030913960400191505060405180910390fd5b610800825111156106e4576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c69642076616c75652073697a650000000000000000000000000000604482015290519081900360640190fd5b604080517f36e2d0c9000000000000000000000000000000000000000000000000000000008152606660048201526024810187905260448101869052905160009173__DIDRegistryLibrary____________________916336e2d0c991606480820192602092909190829003018186803b15801561076157600080fd5b505af4158015610775573d6000803e3d6000fd5b505050506040513d602081101561078b57600080fd5b5051905060005b84518110156108265760006107c6888784815181106107ad57fe5b60200260200101516066610cd79092919063ffffffff16565b90508061081d576040805160e560020a62461bcd02815260206004820152601660248201527f70726f766964657220776173206e6f7420616464656400000000000000000000604482015290519081900360640190fd5b50600101610792565b5060008681526066602090815260408083205481513381850181905243938201849052606080835289519083015288518b96600160a060020a03909416958d957f8f8b755e50eb4efaa1a82e62cbfe4c58d83374b2f20db5960764ba69e062ae43958c959193919283926080840192918801918190849084905b838110156108b85781810151838201526020016108a0565b50505050905090810190601f1680156108e55780820380516001836020036101000a031916815260200191505b5094505050505060405180910390a495945050505050565b600090815260666020526040902054600160a060020a031690565b6060606660010180548060200260200160405190810160405280929190818152602001828054801561096957602002820191906000526020600020905b815481526020019060010190808311610955575b5050505050905090565b61097b610ac1565b61098457600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b6000828152606660205260409020548290600160a060020a03163314610a4b576040805160e560020a62461bcd02815260206004820152601160248201527f496e76616c696420444944206f776e6572000000000000000000000000000000604482015290519081900360640190fd5b6000610a5f6066858563ffffffff610de216565b60408051868152600160a060020a03861660208201528215158183015290519192507fa34c94e3893406b9fa302e5fbe4335b0cc46ca311d7ea24545426ec223a94f41919081900360600190a150505050565b603354600160a060020a031690565b603354600160a060020a0316331490565b6000828152606660205260409020548290600160a060020a03163314610b42576040805160e560020a62461bcd02815260206004820152601160248201527f496e76616c696420444944206f776e6572000000000000000000000000000000604482015290519081900360640190fd5b6000610b566066858563ffffffff610cd716565b905080610bad576040805160e560020a62461bcd02815260206004820152601660248201527f70726f766964657220776173206e6f7420616464656400000000000000000000604482015290519081900360640190fd5b60408051858152600160a060020a038516602082015281517f0c22bba9f36f0f2a7884650bedf42ce7b026851b573c93e4d8cd51f73eceda0f929181900390910190a150505050565b60009081526066602052604090206003015490565b600054610100900460ff1680610c245750610c24610eb3565b80610c32575060005460ff16155b610c705760405160e560020a62461bcd02815260040180806020018281038252602e81526020018061113a602e913960400191505060405180910390fd5b600054610100900460ff16158015610c9b576000805460ff1961ff0019909116610100171660011790555b610ca482610eb9565b8015610cb6576000805461ff00191690555b5050565b610cc2610ac1565b610ccb57600080fd5b610cd481610fba565b50565b6000600160a060020a038216610d37576040805160e560020a62461bcd02815260206004820152601e60248201527f496e76616c69642061737365742070726f766964657220616464726573730000604482015290519081900360640190fd5b600160a060020a038216301415610d825760405160e560020a62461bcd0281526004018080602001828103825260308152602001806110da6030913960400191505060405180910390fd5b610d8d848484611036565b610dd75760008381526020858152604082206004018054600181018255908352912001805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384161790555b5060015b9392505050565b6000600160a060020a038216610e42576040805160e560020a62461bcd02815260206004820152601e60248201527f496e76616c69642061737365742070726f766964657220616464726573730000604482015290519081900360640190fd5b6000610e4f858585611065565b9050806000191415610e65576000915050610ddb565b6000848152602086905260409020600401805482908110610e8257fe5b6000918252602090912001805473ffffffffffffffffffffffffffffffffffffffff19169055506001949350505050565b303b1590565b600054610100900460ff1680610ed25750610ed2610eb3565b80610ee0575060005460ff16155b610f1e5760405160e560020a62461bcd02815260040180806020018281038252602e81526020018061113a602e913960400191505060405180910390fd5b600054610100900460ff16158015610f49576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610cb6576000805461ff00191690555050565b600160a060020a038116610fcd57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b600080611044858585611065565b905080600019141561105a576000915050610ddb565b506001949350505050565b6000805b6000848152602086905260409020600401548110156110cd57600084815260208690526040902060040180548290811061109f57fe5b600091825260209091200154600160a060020a03848116911614156110c5579050610ddb565b600101611069565b5060001994935050505056fe4449442070726f76696465722073686f756c64206e6f74206265207468697320636f6e7472616374206164647265737341747472696275746573206d75737420626520726567697374657265642062792074686520444944206f776e6572732e436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582094de876c87e7581383335a419e2764fc97b93e222225f82baf45242da15413f50029",
-  "address": "0x9254f7c8f1176C685871E7A8A99E11e96775F488",
-  "implementation": "0x802Aed452338970957c96616787F66Df5666B976",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/DIDRegistry.mainnet.json b/artifacts/DIDRegistry.mainnet.json
deleted file mode 100644
index ff42943..0000000
--- a/artifacts/DIDRegistry.mainnet.json
+++ /dev/null
@@ -1,372 +0,0 @@
-{
-  "name": "DIDRegistry",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_checksum",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_value",
-          "type": "string"
-        },
-        {
-          "indexed": false,
-          "name": "_lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "name": "DIDAttributeRegistered",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_provider",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "state",
-          "type": "bool"
-        }
-      ],
-      "name": "DIDProviderRemoved",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "DIDProviderAdded",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_checksum",
-          "type": "bytes32"
-        },
-        {
-          "name": "_providers",
-          "type": "address[]"
-        },
-        {
-          "name": "_value",
-          "type": "string"
-        }
-      ],
-      "name": "registerAttribute",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x534eb706"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "addDIDProvider",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa2d28d46"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "removeDIDProvider",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x7ac5f7c8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "isDIDProvider",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x3c6aa7b7"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getDIDRegister",
-      "outputs": [
-        {
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "name": "lastChecksum",
-          "type": "bytes32"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        },
-        {
-          "name": "providers",
-          "type": "address[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x22c6b519"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getBlockNumberUpdated",
-      "outputs": [
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xbbc1dede"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getDIDOwner",
-      "outputs": [
-        {
-          "name": "didOwner",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6c2ef524"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getDIDRegistrySize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x39c035f0"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getDIDRegisterIds",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x70c6817a"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50611193806100206000396000f3fe608060405234801561001057600080fd5b5060043610610107576000357c0100000000000000000000000000000000000000000000000000000000900480637ac5f7c8116100a9578063a2d28d4611610083578063a2d28d4614610424578063bbc1dede14610450578063c4d66de81461046d578063f2fde38b1461049357610107565b80637ac5f7c8146103e85780638da5cb5b146104145780638f32d59b1461041c57610107565b8063534eb706116100e5578063534eb706146102175780636c2ef5241461034d57806370c6817a14610386578063715018a6146103de57610107565b806322c6b5191461010c57806339c035f0146101bd5780633c6aa7b7146101d7575b600080fd5b6101296004803603602081101561012257600080fd5b50356104b9565b6040518086600160a060020a0316600160a060020a0316815260200185815260200184600160a060020a0316600160a060020a0316815260200183815260200180602001828103825283818151815260200191508051906020019060200280838360005b838110156101a557818101518382015260200161018d565b50505050905001965050505050505060405180910390f35b6101c5610553565b60408051918252519081900360200190f35b610203600480360360408110156101ed57600080fd5b5080359060200135600160a060020a0316610559565b604080519115158252519081900360200190f35b6101c56004803603608081101561022d57600080fd5b81359160208101359181019060608101604082013564010000000081111561025457600080fd5b82018360208201111561026657600080fd5b8035906020019184602083028401116401000000008311171561028857600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156102d857600080fd5b8201836020820111156102ea57600080fd5b8035906020019184600183028401116401000000008311171561030c57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610611945050505050565b61036a6004803603602081101561036357600080fd5b50356108fd565b60408051600160a060020a039092168252519081900360200190f35b61038e610918565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156103ca5781810151838201526020016103b2565b505050509050019250505060405180910390f35b6103e6610973565b005b6103e6600480360360408110156103fe57600080fd5b5080359060200135600160a060020a03166109db565b61036a610ab2565b610203610ac1565b6103e66004803603604081101561043a57600080fd5b5080359060200135600160a060020a0316610ad2565b6101c56004803603602081101561046657600080fd5b5035610bf6565b6103e66004803603602081101561048357600080fd5b5035600160a060020a0316610c0b565b6103e6600480360360208110156104a957600080fd5b5035600160a060020a0316610cba565b600081815260666020908152604091829020805460018201546002830154600384015460049094018054875181880281018801909852808852600160a060020a039485169793969290941694936060939283018282801561054357602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610525575b5050505050905091939590929450565b60675490565b604080517ffc977f2f0000000000000000000000000000000000000000000000000000000081526066600482015260248101849052600160a060020a0383166044820152905160009173__DIDRegistryLibrary____________________9163fc977f2f91606480820192602092909190829003018186803b1580156105de57600080fd5b505af41580156105f2573d6000803e3d6000fd5b505050506040513d602081101561060857600080fd5b50519392505050565b600084815260666020526040812054600160a060020a0316158061064b5750600085815260666020526040902054600160a060020a031633145b6106895760405160e560020a62461bcd02815260040180806020018281038252603081526020018061110a6030913960400191505060405180910390fd5b610800825111156106e4576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c69642076616c75652073697a650000000000000000000000000000604482015290519081900360640190fd5b604080517f36e2d0c9000000000000000000000000000000000000000000000000000000008152606660048201526024810187905260448101869052905160009173__DIDRegistryLibrary____________________916336e2d0c991606480820192602092909190829003018186803b15801561076157600080fd5b505af4158015610775573d6000803e3d6000fd5b505050506040513d602081101561078b57600080fd5b5051905060005b84518110156108265760006107c6888784815181106107ad57fe5b60200260200101516066610cd79092919063ffffffff16565b90508061081d576040805160e560020a62461bcd02815260206004820152601660248201527f70726f766964657220776173206e6f7420616464656400000000000000000000604482015290519081900360640190fd5b50600101610792565b5060008681526066602090815260408083205481513381850181905243938201849052606080835289519083015288518b96600160a060020a03909416958d957f8f8b755e50eb4efaa1a82e62cbfe4c58d83374b2f20db5960764ba69e062ae43958c959193919283926080840192918801918190849084905b838110156108b85781810151838201526020016108a0565b50505050905090810190601f1680156108e55780820380516001836020036101000a031916815260200191505b5094505050505060405180910390a495945050505050565b600090815260666020526040902054600160a060020a031690565b6060606660010180548060200260200160405190810160405280929190818152602001828054801561096957602002820191906000526020600020905b815481526020019060010190808311610955575b5050505050905090565b61097b610ac1565b61098457600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b6000828152606660205260409020548290600160a060020a03163314610a4b576040805160e560020a62461bcd02815260206004820152601160248201527f496e76616c696420444944206f776e6572000000000000000000000000000000604482015290519081900360640190fd5b6000610a5f6066858563ffffffff610de216565b60408051868152600160a060020a03861660208201528215158183015290519192507fa34c94e3893406b9fa302e5fbe4335b0cc46ca311d7ea24545426ec223a94f41919081900360600190a150505050565b603354600160a060020a031690565b603354600160a060020a0316331490565b6000828152606660205260409020548290600160a060020a03163314610b42576040805160e560020a62461bcd02815260206004820152601160248201527f496e76616c696420444944206f776e6572000000000000000000000000000000604482015290519081900360640190fd5b6000610b566066858563ffffffff610cd716565b905080610bad576040805160e560020a62461bcd02815260206004820152601660248201527f70726f766964657220776173206e6f7420616464656400000000000000000000604482015290519081900360640190fd5b60408051858152600160a060020a038516602082015281517f0c22bba9f36f0f2a7884650bedf42ce7b026851b573c93e4d8cd51f73eceda0f929181900390910190a150505050565b60009081526066602052604090206003015490565b600054610100900460ff1680610c245750610c24610eb3565b80610c32575060005460ff16155b610c705760405160e560020a62461bcd02815260040180806020018281038252602e81526020018061113a602e913960400191505060405180910390fd5b600054610100900460ff16158015610c9b576000805460ff1961ff0019909116610100171660011790555b610ca482610eb9565b8015610cb6576000805461ff00191690555b5050565b610cc2610ac1565b610ccb57600080fd5b610cd481610fba565b50565b6000600160a060020a038216610d37576040805160e560020a62461bcd02815260206004820152601e60248201527f496e76616c69642061737365742070726f766964657220616464726573730000604482015290519081900360640190fd5b600160a060020a038216301415610d825760405160e560020a62461bcd0281526004018080602001828103825260308152602001806110da6030913960400191505060405180910390fd5b610d8d848484611036565b610dd75760008381526020858152604082206004018054600181018255908352912001805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384161790555b5060015b9392505050565b6000600160a060020a038216610e42576040805160e560020a62461bcd02815260206004820152601e60248201527f496e76616c69642061737365742070726f766964657220616464726573730000604482015290519081900360640190fd5b6000610e4f858585611065565b9050806000191415610e65576000915050610ddb565b6000848152602086905260409020600401805482908110610e8257fe5b6000918252602090912001805473ffffffffffffffffffffffffffffffffffffffff19169055506001949350505050565b303b1590565b600054610100900460ff1680610ed25750610ed2610eb3565b80610ee0575060005460ff16155b610f1e5760405160e560020a62461bcd02815260040180806020018281038252602e81526020018061113a602e913960400191505060405180910390fd5b600054610100900460ff16158015610f49576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610cb6576000805461ff00191690555050565b600160a060020a038116610fcd57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b600080611044858585611065565b905080600019141561105a576000915050610ddb565b506001949350505050565b6000805b6000848152602086905260409020600401548110156110cd57600084815260208690526040902060040180548290811061109f57fe5b600091825260209091200154600160a060020a03848116911614156110c5579050610ddb565b600101611069565b5060001994935050505056fe4449442070726f76696465722073686f756c64206e6f74206265207468697320636f6e7472616374206164647265737341747472696275746573206d75737420626520726567697374657265642062792074686520444944206f776e6572732e436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582094de876c87e7581383335a419e2764fc97b93e222225f82baf45242da15413f50029",
-  "address": "0xC4A1D6d4778C9A17D5e37797dA2FaB48FA9d01f6",
-  "implementation": "0xA2A6D715791CE06deEBdBa7f6064DD1f8c762206",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/DIDRegistry.nile.json b/artifacts/DIDRegistry.nile.json
deleted file mode 100644
index 935b4fa..0000000
--- a/artifacts/DIDRegistry.nile.json
+++ /dev/null
@@ -1,372 +0,0 @@
-{
-  "name": "DIDRegistry",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_checksum",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_value",
-          "type": "string"
-        },
-        {
-          "indexed": false,
-          "name": "_lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "name": "DIDAttributeRegistered",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_provider",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "state",
-          "type": "bool"
-        }
-      ],
-      "name": "DIDProviderRemoved",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "DIDProviderAdded",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_checksum",
-          "type": "bytes32"
-        },
-        {
-          "name": "_providers",
-          "type": "address[]"
-        },
-        {
-          "name": "_value",
-          "type": "string"
-        }
-      ],
-      "name": "registerAttribute",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x534eb706"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "addDIDProvider",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa2d28d46"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "removeDIDProvider",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x7ac5f7c8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "isDIDProvider",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x3c6aa7b7"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getDIDRegister",
-      "outputs": [
-        {
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "name": "lastChecksum",
-          "type": "bytes32"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        },
-        {
-          "name": "providers",
-          "type": "address[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x22c6b519"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getBlockNumberUpdated",
-      "outputs": [
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xbbc1dede"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getDIDOwner",
-      "outputs": [
-        {
-          "name": "didOwner",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6c2ef524"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getDIDRegistrySize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x39c035f0"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getDIDRegisterIds",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x70c6817a"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50611193806100206000396000f3fe608060405234801561001057600080fd5b5060043610610107576000357c0100000000000000000000000000000000000000000000000000000000900480637ac5f7c8116100a9578063a2d28d4611610083578063a2d28d4614610424578063bbc1dede14610450578063c4d66de81461046d578063f2fde38b1461049357610107565b80637ac5f7c8146103e85780638da5cb5b146104145780638f32d59b1461041c57610107565b8063534eb706116100e5578063534eb706146102175780636c2ef5241461034d57806370c6817a14610386578063715018a6146103de57610107565b806322c6b5191461010c57806339c035f0146101bd5780633c6aa7b7146101d7575b600080fd5b6101296004803603602081101561012257600080fd5b50356104b9565b6040518086600160a060020a0316600160a060020a0316815260200185815260200184600160a060020a0316600160a060020a0316815260200183815260200180602001828103825283818151815260200191508051906020019060200280838360005b838110156101a557818101518382015260200161018d565b50505050905001965050505050505060405180910390f35b6101c5610553565b60408051918252519081900360200190f35b610203600480360360408110156101ed57600080fd5b5080359060200135600160a060020a0316610559565b604080519115158252519081900360200190f35b6101c56004803603608081101561022d57600080fd5b81359160208101359181019060608101604082013564010000000081111561025457600080fd5b82018360208201111561026657600080fd5b8035906020019184602083028401116401000000008311171561028857600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156102d857600080fd5b8201836020820111156102ea57600080fd5b8035906020019184600183028401116401000000008311171561030c57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610611945050505050565b61036a6004803603602081101561036357600080fd5b50356108fd565b60408051600160a060020a039092168252519081900360200190f35b61038e610918565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156103ca5781810151838201526020016103b2565b505050509050019250505060405180910390f35b6103e6610973565b005b6103e6600480360360408110156103fe57600080fd5b5080359060200135600160a060020a03166109db565b61036a610ab2565b610203610ac1565b6103e66004803603604081101561043a57600080fd5b5080359060200135600160a060020a0316610ad2565b6101c56004803603602081101561046657600080fd5b5035610bf6565b6103e66004803603602081101561048357600080fd5b5035600160a060020a0316610c0b565b6103e6600480360360208110156104a957600080fd5b5035600160a060020a0316610cba565b600081815260666020908152604091829020805460018201546002830154600384015460049094018054875181880281018801909852808852600160a060020a039485169793969290941694936060939283018282801561054357602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610525575b5050505050905091939590929450565b60675490565b604080517ffc977f2f0000000000000000000000000000000000000000000000000000000081526066600482015260248101849052600160a060020a0383166044820152905160009173__DIDRegistryLibrary____________________9163fc977f2f91606480820192602092909190829003018186803b1580156105de57600080fd5b505af41580156105f2573d6000803e3d6000fd5b505050506040513d602081101561060857600080fd5b50519392505050565b600084815260666020526040812054600160a060020a0316158061064b5750600085815260666020526040902054600160a060020a031633145b6106895760405160e560020a62461bcd02815260040180806020018281038252603081526020018061110a6030913960400191505060405180910390fd5b610800825111156106e4576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c69642076616c75652073697a650000000000000000000000000000604482015290519081900360640190fd5b604080517f36e2d0c9000000000000000000000000000000000000000000000000000000008152606660048201526024810187905260448101869052905160009173__DIDRegistryLibrary____________________916336e2d0c991606480820192602092909190829003018186803b15801561076157600080fd5b505af4158015610775573d6000803e3d6000fd5b505050506040513d602081101561078b57600080fd5b5051905060005b84518110156108265760006107c6888784815181106107ad57fe5b60200260200101516066610cd79092919063ffffffff16565b90508061081d576040805160e560020a62461bcd02815260206004820152601660248201527f70726f766964657220776173206e6f7420616464656400000000000000000000604482015290519081900360640190fd5b50600101610792565b5060008681526066602090815260408083205481513381850181905243938201849052606080835289519083015288518b96600160a060020a03909416958d957f8f8b755e50eb4efaa1a82e62cbfe4c58d83374b2f20db5960764ba69e062ae43958c959193919283926080840192918801918190849084905b838110156108b85781810151838201526020016108a0565b50505050905090810190601f1680156108e55780820380516001836020036101000a031916815260200191505b5094505050505060405180910390a495945050505050565b600090815260666020526040902054600160a060020a031690565b6060606660010180548060200260200160405190810160405280929190818152602001828054801561096957602002820191906000526020600020905b815481526020019060010190808311610955575b5050505050905090565b61097b610ac1565b61098457600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b6000828152606660205260409020548290600160a060020a03163314610a4b576040805160e560020a62461bcd02815260206004820152601160248201527f496e76616c696420444944206f776e6572000000000000000000000000000000604482015290519081900360640190fd5b6000610a5f6066858563ffffffff610de216565b60408051868152600160a060020a03861660208201528215158183015290519192507fa34c94e3893406b9fa302e5fbe4335b0cc46ca311d7ea24545426ec223a94f41919081900360600190a150505050565b603354600160a060020a031690565b603354600160a060020a0316331490565b6000828152606660205260409020548290600160a060020a03163314610b42576040805160e560020a62461bcd02815260206004820152601160248201527f496e76616c696420444944206f776e6572000000000000000000000000000000604482015290519081900360640190fd5b6000610b566066858563ffffffff610cd716565b905080610bad576040805160e560020a62461bcd02815260206004820152601660248201527f70726f766964657220776173206e6f7420616464656400000000000000000000604482015290519081900360640190fd5b60408051858152600160a060020a038516602082015281517f0c22bba9f36f0f2a7884650bedf42ce7b026851b573c93e4d8cd51f73eceda0f929181900390910190a150505050565b60009081526066602052604090206003015490565b600054610100900460ff1680610c245750610c24610eb3565b80610c32575060005460ff16155b610c705760405160e560020a62461bcd02815260040180806020018281038252602e81526020018061113a602e913960400191505060405180910390fd5b600054610100900460ff16158015610c9b576000805460ff1961ff0019909116610100171660011790555b610ca482610eb9565b8015610cb6576000805461ff00191690555b5050565b610cc2610ac1565b610ccb57600080fd5b610cd481610fba565b50565b6000600160a060020a038216610d37576040805160e560020a62461bcd02815260206004820152601e60248201527f496e76616c69642061737365742070726f766964657220616464726573730000604482015290519081900360640190fd5b600160a060020a038216301415610d825760405160e560020a62461bcd0281526004018080602001828103825260308152602001806110da6030913960400191505060405180910390fd5b610d8d848484611036565b610dd75760008381526020858152604082206004018054600181018255908352912001805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384161790555b5060015b9392505050565b6000600160a060020a038216610e42576040805160e560020a62461bcd02815260206004820152601e60248201527f496e76616c69642061737365742070726f766964657220616464726573730000604482015290519081900360640190fd5b6000610e4f858585611065565b9050806000191415610e65576000915050610ddb565b6000848152602086905260409020600401805482908110610e8257fe5b6000918252602090912001805473ffffffffffffffffffffffffffffffffffffffff19169055506001949350505050565b303b1590565b600054610100900460ff1680610ed25750610ed2610eb3565b80610ee0575060005460ff16155b610f1e5760405160e560020a62461bcd02815260040180806020018281038252602e81526020018061113a602e913960400191505060405180910390fd5b600054610100900460ff16158015610f49576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610cb6576000805461ff00191690555050565b600160a060020a038116610fcd57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b600080611044858585611065565b905080600019141561105a576000915050610ddb565b506001949350505050565b6000805b6000848152602086905260409020600401548110156110cd57600084815260208690526040902060040180548290811061109f57fe5b600091825260209091200154600160a060020a03848116911614156110c5579050610ddb565b600101611069565b5060001994935050505056fe4449442070726f76696465722073686f756c64206e6f74206265207468697320636f6e7472616374206164647265737341747472696275746573206d75737420626520726567697374657265642062792074686520444944206f776e6572732e436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582094de876c87e7581383335a419e2764fc97b93e222225f82baf45242da15413f50029",
-  "address": "0x4A0f7F763B1A7937aED21D63b2A78adc89c5Db23",
-  "implementation": "0xfaD00135E4c941522466574dC39b79DedFd640A2",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/DIDRegistry.pacific.json b/artifacts/DIDRegistry.pacific.json
deleted file mode 100644
index 507fbe9..0000000
--- a/artifacts/DIDRegistry.pacific.json
+++ /dev/null
@@ -1,372 +0,0 @@
-{
-  "name": "DIDRegistry",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_checksum",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_value",
-          "type": "string"
-        },
-        {
-          "indexed": false,
-          "name": "_lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "name": "DIDAttributeRegistered",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_provider",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "state",
-          "type": "bool"
-        }
-      ],
-      "name": "DIDProviderRemoved",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "DIDProviderAdded",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_checksum",
-          "type": "bytes32"
-        },
-        {
-          "name": "_providers",
-          "type": "address[]"
-        },
-        {
-          "name": "_value",
-          "type": "string"
-        }
-      ],
-      "name": "registerAttribute",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x534eb706"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "addDIDProvider",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa2d28d46"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "removeDIDProvider",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x7ac5f7c8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_provider",
-          "type": "address"
-        }
-      ],
-      "name": "isDIDProvider",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x3c6aa7b7"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getDIDRegister",
-      "outputs": [
-        {
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "name": "lastChecksum",
-          "type": "bytes32"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        },
-        {
-          "name": "providers",
-          "type": "address[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x22c6b519"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getBlockNumberUpdated",
-      "outputs": [
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xbbc1dede"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_did",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getDIDOwner",
-      "outputs": [
-        {
-          "name": "didOwner",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6c2ef524"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getDIDRegistrySize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x39c035f0"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getDIDRegisterIds",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x70c6817a"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50611193806100206000396000f3fe608060405234801561001057600080fd5b5060043610610107576000357c0100000000000000000000000000000000000000000000000000000000900480637ac5f7c8116100a9578063a2d28d4611610083578063a2d28d4614610424578063bbc1dede14610450578063c4d66de81461046d578063f2fde38b1461049357610107565b80637ac5f7c8146103e85780638da5cb5b146104145780638f32d59b1461041c57610107565b8063534eb706116100e5578063534eb706146102175780636c2ef5241461034d57806370c6817a14610386578063715018a6146103de57610107565b806322c6b5191461010c57806339c035f0146101bd5780633c6aa7b7146101d7575b600080fd5b6101296004803603602081101561012257600080fd5b50356104b9565b6040518086600160a060020a0316600160a060020a0316815260200185815260200184600160a060020a0316600160a060020a0316815260200183815260200180602001828103825283818151815260200191508051906020019060200280838360005b838110156101a557818101518382015260200161018d565b50505050905001965050505050505060405180910390f35b6101c5610553565b60408051918252519081900360200190f35b610203600480360360408110156101ed57600080fd5b5080359060200135600160a060020a0316610559565b604080519115158252519081900360200190f35b6101c56004803603608081101561022d57600080fd5b81359160208101359181019060608101604082013564010000000081111561025457600080fd5b82018360208201111561026657600080fd5b8035906020019184602083028401116401000000008311171561028857600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156102d857600080fd5b8201836020820111156102ea57600080fd5b8035906020019184600183028401116401000000008311171561030c57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610611945050505050565b61036a6004803603602081101561036357600080fd5b50356108fd565b60408051600160a060020a039092168252519081900360200190f35b61038e610918565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156103ca5781810151838201526020016103b2565b505050509050019250505060405180910390f35b6103e6610973565b005b6103e6600480360360408110156103fe57600080fd5b5080359060200135600160a060020a03166109db565b61036a610ab2565b610203610ac1565b6103e66004803603604081101561043a57600080fd5b5080359060200135600160a060020a0316610ad2565b6101c56004803603602081101561046657600080fd5b5035610bf6565b6103e66004803603602081101561048357600080fd5b5035600160a060020a0316610c0b565b6103e6600480360360208110156104a957600080fd5b5035600160a060020a0316610cba565b600081815260666020908152604091829020805460018201546002830154600384015460049094018054875181880281018801909852808852600160a060020a039485169793969290941694936060939283018282801561054357602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610525575b5050505050905091939590929450565b60675490565b604080517ffc977f2f0000000000000000000000000000000000000000000000000000000081526066600482015260248101849052600160a060020a0383166044820152905160009173__DIDRegistryLibrary____________________9163fc977f2f91606480820192602092909190829003018186803b1580156105de57600080fd5b505af41580156105f2573d6000803e3d6000fd5b505050506040513d602081101561060857600080fd5b50519392505050565b600084815260666020526040812054600160a060020a0316158061064b5750600085815260666020526040902054600160a060020a031633145b6106895760405160e560020a62461bcd02815260040180806020018281038252603081526020018061110a6030913960400191505060405180910390fd5b610800825111156106e4576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c69642076616c75652073697a650000000000000000000000000000604482015290519081900360640190fd5b604080517f36e2d0c9000000000000000000000000000000000000000000000000000000008152606660048201526024810187905260448101869052905160009173__DIDRegistryLibrary____________________916336e2d0c991606480820192602092909190829003018186803b15801561076157600080fd5b505af4158015610775573d6000803e3d6000fd5b505050506040513d602081101561078b57600080fd5b5051905060005b84518110156108265760006107c6888784815181106107ad57fe5b60200260200101516066610cd79092919063ffffffff16565b90508061081d576040805160e560020a62461bcd02815260206004820152601660248201527f70726f766964657220776173206e6f7420616464656400000000000000000000604482015290519081900360640190fd5b50600101610792565b5060008681526066602090815260408083205481513381850181905243938201849052606080835289519083015288518b96600160a060020a03909416958d957f8f8b755e50eb4efaa1a82e62cbfe4c58d83374b2f20db5960764ba69e062ae43958c959193919283926080840192918801918190849084905b838110156108b85781810151838201526020016108a0565b50505050905090810190601f1680156108e55780820380516001836020036101000a031916815260200191505b5094505050505060405180910390a495945050505050565b600090815260666020526040902054600160a060020a031690565b6060606660010180548060200260200160405190810160405280929190818152602001828054801561096957602002820191906000526020600020905b815481526020019060010190808311610955575b5050505050905090565b61097b610ac1565b61098457600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b6000828152606660205260409020548290600160a060020a03163314610a4b576040805160e560020a62461bcd02815260206004820152601160248201527f496e76616c696420444944206f776e6572000000000000000000000000000000604482015290519081900360640190fd5b6000610a5f6066858563ffffffff610de216565b60408051868152600160a060020a03861660208201528215158183015290519192507fa34c94e3893406b9fa302e5fbe4335b0cc46ca311d7ea24545426ec223a94f41919081900360600190a150505050565b603354600160a060020a031690565b603354600160a060020a0316331490565b6000828152606660205260409020548290600160a060020a03163314610b42576040805160e560020a62461bcd02815260206004820152601160248201527f496e76616c696420444944206f776e6572000000000000000000000000000000604482015290519081900360640190fd5b6000610b566066858563ffffffff610cd716565b905080610bad576040805160e560020a62461bcd02815260206004820152601660248201527f70726f766964657220776173206e6f7420616464656400000000000000000000604482015290519081900360640190fd5b60408051858152600160a060020a038516602082015281517f0c22bba9f36f0f2a7884650bedf42ce7b026851b573c93e4d8cd51f73eceda0f929181900390910190a150505050565b60009081526066602052604090206003015490565b600054610100900460ff1680610c245750610c24610eb3565b80610c32575060005460ff16155b610c705760405160e560020a62461bcd02815260040180806020018281038252602e81526020018061113a602e913960400191505060405180910390fd5b600054610100900460ff16158015610c9b576000805460ff1961ff0019909116610100171660011790555b610ca482610eb9565b8015610cb6576000805461ff00191690555b5050565b610cc2610ac1565b610ccb57600080fd5b610cd481610fba565b50565b6000600160a060020a038216610d37576040805160e560020a62461bcd02815260206004820152601e60248201527f496e76616c69642061737365742070726f766964657220616464726573730000604482015290519081900360640190fd5b600160a060020a038216301415610d825760405160e560020a62461bcd0281526004018080602001828103825260308152602001806110da6030913960400191505060405180910390fd5b610d8d848484611036565b610dd75760008381526020858152604082206004018054600181018255908352912001805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384161790555b5060015b9392505050565b6000600160a060020a038216610e42576040805160e560020a62461bcd02815260206004820152601e60248201527f496e76616c69642061737365742070726f766964657220616464726573730000604482015290519081900360640190fd5b6000610e4f858585611065565b9050806000191415610e65576000915050610ddb565b6000848152602086905260409020600401805482908110610e8257fe5b6000918252602090912001805473ffffffffffffffffffffffffffffffffffffffff19169055506001949350505050565b303b1590565b600054610100900460ff1680610ed25750610ed2610eb3565b80610ee0575060005460ff16155b610f1e5760405160e560020a62461bcd02815260040180806020018281038252602e81526020018061113a602e913960400191505060405180910390fd5b600054610100900460ff16158015610f49576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610cb6576000805461ff00191690555050565b600160a060020a038116610fcd57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b600080611044858585611065565b905080600019141561105a576000915050610ddb565b506001949350505050565b6000805b6000848152602086905260409020600401548110156110cd57600084815260208690526040902060040180548290811061109f57fe5b600091825260209091200154600160a060020a03848116911614156110c5579050610ddb565b600101611069565b5060001994935050505056fe4449442070726f76696465722073686f756c64206e6f74206265207468697320636f6e7472616374206164647265737341747472696275746573206d75737420626520726567697374657265642062792074686520444944206f776e6572732e436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582094de876c87e7581383335a419e2764fc97b93e222225f82baf45242da15413f50029",
-  "address": "0x1f0E059a50356D8617980F8fa21a53F723072712",
-  "implementation": "0xBEfa02e1cdbdBeC860cFc22DD36C6b585701a54D",
-  "version": "v0.10.3"
-}
\ No newline at end of file
diff --git a/artifacts/DIDRegistryLibrary.duero.json b/artifacts/DIDRegistryLibrary.duero.json
deleted file mode 100644
index 58e7a33..0000000
--- a/artifacts/DIDRegistryLibrary.duero.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "DIDRegistryLibrary",
-  "abi": [],
-  "bytecode": "0x610399610026600b82828239805160001a60731461001957fe5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061005c577c0100000000000000000000000000000000000000000000000000000000600035046336e2d0c98114610061578063fc977f2f146100a9575b600080fd5b81801561006d57600080fd5b506100976004803603606081101561008457600080fd5b50803590602081013590604001356100fc565b60408051918252519081900360200190f35b6100e8600480360360608110156100bf57600080fd5b508035906020810135906040013573ffffffffffffffffffffffffffffffffffffffff1661020a565b604080519115158252519081900360200190f35b60008281526020849052604081205473ffffffffffffffffffffffffffffffffffffffff1680610142575060018085018054918201815560009081526020902001839055335b6040805160a08101825273ffffffffffffffffffffffffffffffffffffffff83811682526020808301878152338486019081524360608601908152865160008082528186018952608088019182528c81528d8652979097208651815490871673ffffffffffffffffffffffffffffffffffffffff199182161782559351600182015591516002830180549190961693169290921790935551600383015592518051929391926101f792600485019201906102ba565b50505060018501549150505b9392505050565b600080610218858585610239565b905080600019141561022e576000915050610203565b506001949350505050565b6000805b6000848152602086905260409020600401548110156102ae57600084815260208690526040902060040180548290811061027357fe5b60009182526020909120015473ffffffffffffffffffffffffffffffffffffffff848116911614156102a6579050610203565b60010161023d565b50600019949350505050565b828054828255906000526020600020908101928215610329579160200282015b82811115610329578251825473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff9091161782556020909201916001909101906102da565b50610335929150610339565b5090565b61036a91905b8082111561033557805473ffffffffffffffffffffffffffffffffffffffff1916815560010161033f565b9056fea165627a7a723058208666a0cc1c3456d7fcaf70d019cf98e1084c6cfca93055c252b04c3a335cb6390029",
-  "address": "0x663C7CF54a15fb23aF1dCab15bfa968B8be5903D",
-  "implementation": "0x663C7CF54a15fb23aF1dCab15bfa968B8be5903D",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/DIDRegistryLibrary.kovan.json b/artifacts/DIDRegistryLibrary.kovan.json
deleted file mode 100644
index 764314a..0000000
--- a/artifacts/DIDRegistryLibrary.kovan.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "DIDRegistryLibrary",
-  "abi": [],
-  "bytecode": "0x610399610026600b82828239805160001a60731461001957fe5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061005c577c0100000000000000000000000000000000000000000000000000000000600035046336e2d0c98114610061578063fc977f2f146100a9575b600080fd5b81801561006d57600080fd5b506100976004803603606081101561008457600080fd5b50803590602081013590604001356100fc565b60408051918252519081900360200190f35b6100e8600480360360608110156100bf57600080fd5b508035906020810135906040013573ffffffffffffffffffffffffffffffffffffffff1661020a565b604080519115158252519081900360200190f35b60008281526020849052604081205473ffffffffffffffffffffffffffffffffffffffff1680610142575060018085018054918201815560009081526020902001839055335b6040805160a08101825273ffffffffffffffffffffffffffffffffffffffff83811682526020808301878152338486019081524360608601908152865160008082528186018952608088019182528c81528d8652979097208651815490871673ffffffffffffffffffffffffffffffffffffffff199182161782559351600182015591516002830180549190961693169290921790935551600383015592518051929391926101f792600485019201906102ba565b50505060018501549150505b9392505050565b600080610218858585610239565b905080600019141561022e576000915050610203565b506001949350505050565b6000805b6000848152602086905260409020600401548110156102ae57600084815260208690526040902060040180548290811061027357fe5b60009182526020909120015473ffffffffffffffffffffffffffffffffffffffff848116911614156102a6579050610203565b60010161023d565b50600019949350505050565b828054828255906000526020600020908101928215610329579160200282015b82811115610329578251825473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff9091161782556020909201916001909101906102da565b50610335929150610339565b5090565b61036a91905b8082111561033557805473ffffffffffffffffffffffffffffffffffffffff1916815560010161033f565b9056fea165627a7a723058208666a0cc1c3456d7fcaf70d019cf98e1084c6cfca93055c252b04c3a335cb6390029",
-  "address": "0xf22aEF1421CCd4f0A0D0BB1f7fe03233384c69B4",
-  "implementation": "0xf22aEF1421CCd4f0A0D0BB1f7fe03233384c69B4",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/DIDRegistryLibrary.mainnet.json b/artifacts/DIDRegistryLibrary.mainnet.json
deleted file mode 100644
index 893241b..0000000
--- a/artifacts/DIDRegistryLibrary.mainnet.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "DIDRegistryLibrary",
-  "abi": [],
-  "bytecode": "0x610399610026600b82828239805160001a60731461001957fe5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061005c577c0100000000000000000000000000000000000000000000000000000000600035046336e2d0c98114610061578063fc977f2f146100a9575b600080fd5b81801561006d57600080fd5b506100976004803603606081101561008457600080fd5b50803590602081013590604001356100fc565b60408051918252519081900360200190f35b6100e8600480360360608110156100bf57600080fd5b508035906020810135906040013573ffffffffffffffffffffffffffffffffffffffff1661020a565b604080519115158252519081900360200190f35b60008281526020849052604081205473ffffffffffffffffffffffffffffffffffffffff1680610142575060018085018054918201815560009081526020902001839055335b6040805160a08101825273ffffffffffffffffffffffffffffffffffffffff83811682526020808301878152338486019081524360608601908152865160008082528186018952608088019182528c81528d8652979097208651815490871673ffffffffffffffffffffffffffffffffffffffff199182161782559351600182015591516002830180549190961693169290921790935551600383015592518051929391926101f792600485019201906102ba565b50505060018501549150505b9392505050565b600080610218858585610239565b905080600019141561022e576000915050610203565b506001949350505050565b6000805b6000848152602086905260409020600401548110156102ae57600084815260208690526040902060040180548290811061027357fe5b60009182526020909120015473ffffffffffffffffffffffffffffffffffffffff848116911614156102a6579050610203565b60010161023d565b50600019949350505050565b828054828255906000526020600020908101928215610329579160200282015b82811115610329578251825473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff9091161782556020909201916001909101906102da565b50610335929150610339565b5090565b61036a91905b8082111561033557805473ffffffffffffffffffffffffffffffffffffffff1916815560010161033f565b9056fea165627a7a723058208666a0cc1c3456d7fcaf70d019cf98e1084c6cfca93055c252b04c3a335cb6390029",
-  "address": "0xFb4231AF132A8E160292022eBd8ea4292104B1Da",
-  "implementation": "0xFb4231AF132A8E160292022eBd8ea4292104B1Da",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/DIDRegistryLibrary.nile.json b/artifacts/DIDRegistryLibrary.nile.json
deleted file mode 100644
index f2db8a2..0000000
--- a/artifacts/DIDRegistryLibrary.nile.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "DIDRegistryLibrary",
-  "abi": [],
-  "bytecode": "0x610399610026600b82828239805160001a60731461001957fe5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061005c577c0100000000000000000000000000000000000000000000000000000000600035046336e2d0c98114610061578063fc977f2f146100a9575b600080fd5b81801561006d57600080fd5b506100976004803603606081101561008457600080fd5b50803590602081013590604001356100fc565b60408051918252519081900360200190f35b6100e8600480360360608110156100bf57600080fd5b508035906020810135906040013573ffffffffffffffffffffffffffffffffffffffff1661020a565b604080519115158252519081900360200190f35b60008281526020849052604081205473ffffffffffffffffffffffffffffffffffffffff1680610142575060018085018054918201815560009081526020902001839055335b6040805160a08101825273ffffffffffffffffffffffffffffffffffffffff83811682526020808301878152338486019081524360608601908152865160008082528186018952608088019182528c81528d8652979097208651815490871673ffffffffffffffffffffffffffffffffffffffff199182161782559351600182015591516002830180549190961693169290921790935551600383015592518051929391926101f792600485019201906102ba565b50505060018501549150505b9392505050565b600080610218858585610239565b905080600019141561022e576000915050610203565b506001949350505050565b6000805b6000848152602086905260409020600401548110156102ae57600084815260208690526040902060040180548290811061027357fe5b60009182526020909120015473ffffffffffffffffffffffffffffffffffffffff848116911614156102a6579050610203565b60010161023d565b50600019949350505050565b828054828255906000526020600020908101928215610329579160200282015b82811115610329578251825473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff9091161782556020909201916001909101906102da565b50610335929150610339565b5090565b61036a91905b8082111561033557805473ffffffffffffffffffffffffffffffffffffffff1916815560010161033f565b9056fea165627a7a723058208666a0cc1c3456d7fcaf70d019cf98e1084c6cfca93055c252b04c3a335cb6390029",
-  "address": "0x7E51692679F0d67723E82f69437B6F64C080B3A4",
-  "implementation": "0x7E51692679F0d67723E82f69437B6F64C080B3A4",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/DIDRegistryLibrary.pacific.json b/artifacts/DIDRegistryLibrary.pacific.json
deleted file mode 100644
index fa27eaa..0000000
--- a/artifacts/DIDRegistryLibrary.pacific.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "DIDRegistryLibrary",
-  "abi": [],
-  "bytecode": "0x610399610026600b82828239805160001a60731461001957fe5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061005c577c0100000000000000000000000000000000000000000000000000000000600035046336e2d0c98114610061578063fc977f2f146100a9575b600080fd5b81801561006d57600080fd5b506100976004803603606081101561008457600080fd5b50803590602081013590604001356100fc565b60408051918252519081900360200190f35b6100e8600480360360608110156100bf57600080fd5b508035906020810135906040013573ffffffffffffffffffffffffffffffffffffffff1661020a565b604080519115158252519081900360200190f35b60008281526020849052604081205473ffffffffffffffffffffffffffffffffffffffff1680610142575060018085018054918201815560009081526020902001839055335b6040805160a08101825273ffffffffffffffffffffffffffffffffffffffff83811682526020808301878152338486019081524360608601908152865160008082528186018952608088019182528c81528d8652979097208651815490871673ffffffffffffffffffffffffffffffffffffffff199182161782559351600182015591516002830180549190961693169290921790935551600383015592518051929391926101f792600485019201906102ba565b50505060018501549150505b9392505050565b600080610218858585610239565b905080600019141561022e576000915050610203565b506001949350505050565b6000805b6000848152602086905260409020600401548110156102ae57600084815260208690526040902060040180548290811061027357fe5b60009182526020909120015473ffffffffffffffffffffffffffffffffffffffff848116911614156102a6579050610203565b60010161023d565b50600019949350505050565b828054828255906000526020600020908101928215610329579160200282015b82811115610329578251825473ffffffffffffffffffffffffffffffffffffffff191673ffffffffffffffffffffffffffffffffffffffff9091161782556020909201916001909101906102da565b50610335929150610339565b5090565b61036a91905b8082111561033557805473ffffffffffffffffffffffffffffffffffffffff1916815560010161033f565b9056fea165627a7a723058208666a0cc1c3456d7fcaf70d019cf98e1084c6cfca93055c252b04c3a335cb6390029",
-  "address": "0xA3a9ae1D79c226Bb20730dD8e11C4eED1D200f27",
-  "implementation": "0xA3a9ae1D79c226Bb20730dD8e11C4eED1D200f27",
-  "version": "v0.10.3"
-}
\ No newline at end of file
diff --git a/artifacts/Dispenser.duero.json b/artifacts/Dispenser.duero.json
deleted file mode 100644
index c86f421..0000000
--- a/artifacts/Dispenser.duero.json
+++ /dev/null
@@ -1,234 +0,0 @@
-{
-  "name": "Dispenser",
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "oceanToken",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x244bb7f0"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "requester",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "minPeriod",
-          "type": "uint256"
-        }
-      ],
-      "name": "RequestFrequencyExceeded",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "requester",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "amount",
-          "type": "uint256"
-        },
-        {
-          "indexed": false,
-          "name": "maxAmount",
-          "type": "uint256"
-        }
-      ],
-      "name": "RequestLimitExceeded",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_oceanTokenAddress",
-          "type": "address"
-        },
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x485cc955"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "requestTokens",
-      "outputs": [
-        {
-          "name": "tokensTransferred",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xeef9c27c"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "period",
-          "type": "uint256"
-        }
-      ],
-      "name": "setMinPeriod",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf8210769"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "setMaxAmount",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4fe47f70"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "setMaxMintAmount",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x088a4ed0"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506109e8806100206000396000f3fe608060405234801561001057600080fd5b50600436106100c6576000357c0100000000000000000000000000000000000000000000000000000000900480638da5cb5b1161008e5780638da5cb5b146101615780638f32d59b14610169578063c4d66de814610185578063eef9c27c146101ab578063f2fde38b146101c8578063f8210769146101ee576100c6565b8063088a4ed0146100cb578063244bb7f0146100ea578063485cc9551461010e5780634fe47f701461013c578063715018a614610159575b600080fd5b6100e8600480360360208110156100e157600080fd5b503561020b565b005b6100f2610236565b60408051600160a060020a039092168252519081900360200190f35b6100e86004803603604081101561012457600080fd5b50600160a060020a0381358116916020013516610245565b6100e86004803603602081101561015257600080fd5b5035610433565b6100e861045e565b6100f26104c6565b6101716104d5565b604080519115158252519081900360200190f35b6100e86004803603602081101561019b57600080fd5b5035600160a060020a03166104e6565b610171600480360360208110156101c157600080fd5b50356105e8565b6100e8600480360360208110156101de57600080fd5b5035600160a060020a0316610871565b6100e86004803603602081101561020457600080fd5b503561088e565b6102136104d5565b61021c57600080fd5b606b5461023090829063ffffffff6108a416565b60695550565b606c54600160a060020a031681565b600054610100900460ff168061025e575061025e6108d4565b8061026c575060005460ff16155b6102aa5760405160e560020a62461bcd02815260040180806020018281038252602e81526020018061098f602e913960400191505060405180910390fd5b600054610100900460ff161580156102d5576000805460ff1961ff0019909116610100171660011790555b82600160a060020a03811661031e5760405160e560020a62461bcd0281526004018080602001828103825260268152602001806109696026913960400191505060405180910390fd5b610327836104e6565b6000606755606c805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a038681169190911791829055604080517f313ce5670000000000000000000000000000000000000000000000000000000081529051929091169163313ce56791600480820192602092909190829003018186803b1580156103ae57600080fd5b505afa1580156103c2573d6000803e3d6000fd5b505050506040513d60208110156103d857600080fd5b505160ff16600a0a606b8190556103f8906103e89063ffffffff6108a416565b6068556000606a55606b54610418906305f5e1009063ffffffff6108a416565b60695550801561042e576000805461ff00191690555b505050565b61043b6104d5565b61044457600080fd5b606b5461045890829063ffffffff6108a416565b60685550565b6104666104d5565b61046f57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff16806104ff57506104ff6108d4565b8061050d575060005460ff16155b61054b5760405160e560020a62461bcd02815260040180806020018281038252602e81526020018061098f602e913960400191505060405180910390fd5b600054610100900460ff16158015610576576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a380156105e4576000805461ff00191690555b5050565b6000338061062a5760405160e560020a62461bcd0281526004018080602001828103825260268152602001806109696026913960400191505060405180910390fd5b6000610641606b54856108a490919063ffffffff16565b90506069546067548201106106a0576040805160e560020a62461bcd02815260206004820152601660248201527f4578636565646564206d61784d696e74416d6f756e7400000000000000000000604482015290519081900360640190fd5b606a5433600090815260666020526040902054014210156106fd57606a54604080519182525133917f5fc1aee0cb9820976755a7c88bb366506eba3eaa69cdbf057e50a893c07f3ddf919081900360200190a2600092505061086b565b60685481111561075057606854604080518681526020810192909252805133927f6ba017f04268af016965afed4b76d07ee8b8d2822593b565af060c914e015d4092908290030190a2600092505061086b565b606c54604080517f40c10f19000000000000000000000000000000000000000000000000000000008152336004820152602481018490529051600160a060020a03909216916340c10f19916044808201926020929091908290030181600087803b1580156107bd57600080fd5b505af11580156107d1573d6000803e3d6000fd5b505050506040513d60208110156107e757600080fd5b505161083d576040805160e560020a62461bcd02815260206004820152601560248201527f546f6b656e206d696e74696e67206661696c65642e0000000000000000000000604482015290519081900360640190fd5b336000908152606660205260409020429055606754610862908263ffffffff6108da16565b60675550600191505b50919050565b6108796104d5565b61088257600080fd5b61088b816108ec565b50565b6108966104d5565b61089f57600080fd5b606a55565b6000826108b3575060006108ce565b828202828482816108c057fe5b04146108cb57600080fd5b90505b92915050565b303b1590565b6000828201838110156108cb57600080fd5b600160a060020a0381166108ff57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe697356616c696441646472657373206661696c65642c2041646472657373206973203078302e436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820673abbd2132011ee2c67e834c77edaf2330992ec8ba7f7747126e5e8e2c038420029",
-  "address": "0xF7B1be190A13bDD9157d9493dF9F4BFD0c8a097F",
-  "implementation": "0x23f00FdC104b4258B28AFEFD92A510840714654b",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/Dispenser.kovan.json b/artifacts/Dispenser.kovan.json
deleted file mode 100644
index e1f2bbc..0000000
--- a/artifacts/Dispenser.kovan.json
+++ /dev/null
@@ -1,234 +0,0 @@
-{
-  "name": "Dispenser",
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "oceanToken",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x244bb7f0"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "requester",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "minPeriod",
-          "type": "uint256"
-        }
-      ],
-      "name": "RequestFrequencyExceeded",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "requester",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "amount",
-          "type": "uint256"
-        },
-        {
-          "indexed": false,
-          "name": "maxAmount",
-          "type": "uint256"
-        }
-      ],
-      "name": "RequestLimitExceeded",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_oceanTokenAddress",
-          "type": "address"
-        },
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x485cc955"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "requestTokens",
-      "outputs": [
-        {
-          "name": "tokensTransferred",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xeef9c27c"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "period",
-          "type": "uint256"
-        }
-      ],
-      "name": "setMinPeriod",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf8210769"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "setMaxAmount",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4fe47f70"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "setMaxMintAmount",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x088a4ed0"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506109e8806100206000396000f3fe608060405234801561001057600080fd5b50600436106100c6576000357c0100000000000000000000000000000000000000000000000000000000900480638da5cb5b1161008e5780638da5cb5b146101615780638f32d59b14610169578063c4d66de814610185578063eef9c27c146101ab578063f2fde38b146101c8578063f8210769146101ee576100c6565b8063088a4ed0146100cb578063244bb7f0146100ea578063485cc9551461010e5780634fe47f701461013c578063715018a614610159575b600080fd5b6100e8600480360360208110156100e157600080fd5b503561020b565b005b6100f2610236565b60408051600160a060020a039092168252519081900360200190f35b6100e86004803603604081101561012457600080fd5b50600160a060020a0381358116916020013516610245565b6100e86004803603602081101561015257600080fd5b5035610433565b6100e861045e565b6100f26104c6565b6101716104d5565b604080519115158252519081900360200190f35b6100e86004803603602081101561019b57600080fd5b5035600160a060020a03166104e6565b610171600480360360208110156101c157600080fd5b50356105e8565b6100e8600480360360208110156101de57600080fd5b5035600160a060020a0316610871565b6100e86004803603602081101561020457600080fd5b503561088e565b6102136104d5565b61021c57600080fd5b606b5461023090829063ffffffff6108a416565b60695550565b606c54600160a060020a031681565b600054610100900460ff168061025e575061025e6108d4565b8061026c575060005460ff16155b6102aa5760405160e560020a62461bcd02815260040180806020018281038252602e81526020018061098f602e913960400191505060405180910390fd5b600054610100900460ff161580156102d5576000805460ff1961ff0019909116610100171660011790555b82600160a060020a03811661031e5760405160e560020a62461bcd0281526004018080602001828103825260268152602001806109696026913960400191505060405180910390fd5b610327836104e6565b6000606755606c805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a038681169190911791829055604080517f313ce5670000000000000000000000000000000000000000000000000000000081529051929091169163313ce56791600480820192602092909190829003018186803b1580156103ae57600080fd5b505afa1580156103c2573d6000803e3d6000fd5b505050506040513d60208110156103d857600080fd5b505160ff16600a0a606b8190556103f8906103e89063ffffffff6108a416565b6068556000606a55606b54610418906305f5e1009063ffffffff6108a416565b60695550801561042e576000805461ff00191690555b505050565b61043b6104d5565b61044457600080fd5b606b5461045890829063ffffffff6108a416565b60685550565b6104666104d5565b61046f57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff16806104ff57506104ff6108d4565b8061050d575060005460ff16155b61054b5760405160e560020a62461bcd02815260040180806020018281038252602e81526020018061098f602e913960400191505060405180910390fd5b600054610100900460ff16158015610576576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a380156105e4576000805461ff00191690555b5050565b6000338061062a5760405160e560020a62461bcd0281526004018080602001828103825260268152602001806109696026913960400191505060405180910390fd5b6000610641606b54856108a490919063ffffffff16565b90506069546067548201106106a0576040805160e560020a62461bcd02815260206004820152601660248201527f4578636565646564206d61784d696e74416d6f756e7400000000000000000000604482015290519081900360640190fd5b606a5433600090815260666020526040902054014210156106fd57606a54604080519182525133917f5fc1aee0cb9820976755a7c88bb366506eba3eaa69cdbf057e50a893c07f3ddf919081900360200190a2600092505061086b565b60685481111561075057606854604080518681526020810192909252805133927f6ba017f04268af016965afed4b76d07ee8b8d2822593b565af060c914e015d4092908290030190a2600092505061086b565b606c54604080517f40c10f19000000000000000000000000000000000000000000000000000000008152336004820152602481018490529051600160a060020a03909216916340c10f19916044808201926020929091908290030181600087803b1580156107bd57600080fd5b505af11580156107d1573d6000803e3d6000fd5b505050506040513d60208110156107e757600080fd5b505161083d576040805160e560020a62461bcd02815260206004820152601560248201527f546f6b656e206d696e74696e67206661696c65642e0000000000000000000000604482015290519081900360640190fd5b336000908152606660205260409020429055606754610862908263ffffffff6108da16565b60675550600191505b50919050565b6108796104d5565b61088257600080fd5b61088b816108ec565b50565b6108966104d5565b61089f57600080fd5b606a55565b6000826108b3575060006108ce565b828202828482816108c057fe5b04146108cb57600080fd5b90505b92915050565b303b1590565b6000828201838110156108cb57600080fd5b600160a060020a0381166108ff57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe697356616c696441646472657373206661696c65642c2041646472657373206973203078302e436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820673abbd2132011ee2c67e834c77edaf2330992ec8ba7f7747126e5e8e2c038420029",
-  "address": "0x5B92243133094210F504dF6B9D54fD70E7B281DC",
-  "implementation": "0xDB367A8f0ea62c4c2E24956271182A141cd35630",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/Dispenser.nile.json b/artifacts/Dispenser.nile.json
deleted file mode 100644
index 626d3cd..0000000
--- a/artifacts/Dispenser.nile.json
+++ /dev/null
@@ -1,234 +0,0 @@
-{
-  "name": "Dispenser",
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "oceanToken",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x244bb7f0"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "requester",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "minPeriod",
-          "type": "uint256"
-        }
-      ],
-      "name": "RequestFrequencyExceeded",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "requester",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "amount",
-          "type": "uint256"
-        },
-        {
-          "indexed": false,
-          "name": "maxAmount",
-          "type": "uint256"
-        }
-      ],
-      "name": "RequestLimitExceeded",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_oceanTokenAddress",
-          "type": "address"
-        },
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x485cc955"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "requestTokens",
-      "outputs": [
-        {
-          "name": "tokensTransferred",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xeef9c27c"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "period",
-          "type": "uint256"
-        }
-      ],
-      "name": "setMinPeriod",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf8210769"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "setMaxAmount",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4fe47f70"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "setMaxMintAmount",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x088a4ed0"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506109e8806100206000396000f3fe608060405234801561001057600080fd5b50600436106100c6576000357c0100000000000000000000000000000000000000000000000000000000900480638da5cb5b1161008e5780638da5cb5b146101615780638f32d59b14610169578063c4d66de814610185578063eef9c27c146101ab578063f2fde38b146101c8578063f8210769146101ee576100c6565b8063088a4ed0146100cb578063244bb7f0146100ea578063485cc9551461010e5780634fe47f701461013c578063715018a614610159575b600080fd5b6100e8600480360360208110156100e157600080fd5b503561020b565b005b6100f2610236565b60408051600160a060020a039092168252519081900360200190f35b6100e86004803603604081101561012457600080fd5b50600160a060020a0381358116916020013516610245565b6100e86004803603602081101561015257600080fd5b5035610433565b6100e861045e565b6100f26104c6565b6101716104d5565b604080519115158252519081900360200190f35b6100e86004803603602081101561019b57600080fd5b5035600160a060020a03166104e6565b610171600480360360208110156101c157600080fd5b50356105e8565b6100e8600480360360208110156101de57600080fd5b5035600160a060020a0316610871565b6100e86004803603602081101561020457600080fd5b503561088e565b6102136104d5565b61021c57600080fd5b606b5461023090829063ffffffff6108a416565b60695550565b606c54600160a060020a031681565b600054610100900460ff168061025e575061025e6108d4565b8061026c575060005460ff16155b6102aa5760405160e560020a62461bcd02815260040180806020018281038252602e81526020018061098f602e913960400191505060405180910390fd5b600054610100900460ff161580156102d5576000805460ff1961ff0019909116610100171660011790555b82600160a060020a03811661031e5760405160e560020a62461bcd0281526004018080602001828103825260268152602001806109696026913960400191505060405180910390fd5b610327836104e6565b6000606755606c805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a038681169190911791829055604080517f313ce5670000000000000000000000000000000000000000000000000000000081529051929091169163313ce56791600480820192602092909190829003018186803b1580156103ae57600080fd5b505afa1580156103c2573d6000803e3d6000fd5b505050506040513d60208110156103d857600080fd5b505160ff16600a0a606b8190556103f8906103e89063ffffffff6108a416565b6068556000606a55606b54610418906305f5e1009063ffffffff6108a416565b60695550801561042e576000805461ff00191690555b505050565b61043b6104d5565b61044457600080fd5b606b5461045890829063ffffffff6108a416565b60685550565b6104666104d5565b61046f57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff16806104ff57506104ff6108d4565b8061050d575060005460ff16155b61054b5760405160e560020a62461bcd02815260040180806020018281038252602e81526020018061098f602e913960400191505060405180910390fd5b600054610100900460ff16158015610576576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a380156105e4576000805461ff00191690555b5050565b6000338061062a5760405160e560020a62461bcd0281526004018080602001828103825260268152602001806109696026913960400191505060405180910390fd5b6000610641606b54856108a490919063ffffffff16565b90506069546067548201106106a0576040805160e560020a62461bcd02815260206004820152601660248201527f4578636565646564206d61784d696e74416d6f756e7400000000000000000000604482015290519081900360640190fd5b606a5433600090815260666020526040902054014210156106fd57606a54604080519182525133917f5fc1aee0cb9820976755a7c88bb366506eba3eaa69cdbf057e50a893c07f3ddf919081900360200190a2600092505061086b565b60685481111561075057606854604080518681526020810192909252805133927f6ba017f04268af016965afed4b76d07ee8b8d2822593b565af060c914e015d4092908290030190a2600092505061086b565b606c54604080517f40c10f19000000000000000000000000000000000000000000000000000000008152336004820152602481018490529051600160a060020a03909216916340c10f19916044808201926020929091908290030181600087803b1580156107bd57600080fd5b505af11580156107d1573d6000803e3d6000fd5b505050506040513d60208110156107e757600080fd5b505161083d576040805160e560020a62461bcd02815260206004820152601560248201527f546f6b656e206d696e74696e67206661696c65642e0000000000000000000000604482015290519081900360640190fd5b336000908152606660205260409020429055606754610862908263ffffffff6108da16565b60675550600191505b50919050565b6108796104d5565b61088257600080fd5b61088b816108ec565b50565b6108966104d5565b61089f57600080fd5b606a55565b6000826108b3575060006108ce565b828202828482816108c057fe5b04146108cb57600080fd5b90505b92915050565b303b1590565b6000828201838110156108cb57600080fd5b600160a060020a0381166108ff57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe697356616c696441646472657373206661696c65642c2041646472657373206973203078302e436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820673abbd2132011ee2c67e834c77edaf2330992ec8ba7f7747126e5e8e2c038420029",
-  "address": "0x865396b7ddc58C693db7FCAD1168E3BD95Fe3368",
-  "implementation": "0xe584D1Bb16645951a2192B80494496D456397Efc",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/EpochLibrary.duero.json b/artifacts/EpochLibrary.duero.json
deleted file mode 100644
index bdcb1a2..0000000
--- a/artifacts/EpochLibrary.duero.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "EpochLibrary",
-  "abi": [],
-  "bytecode": "0x6101fd610026600b82828239805160001a60731461001957fe5b30600052607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610072577c010000000000000000000000000000000000000000000000000000000060003504631e6af9c1811461007757806338ac766b146100a6578063dde77bf0146100c3578063f3b68c95146100fa575b600080fd5b6100946004803603602081101561008d57600080fd5b503561011d565b60408051918252519081900360200190f35b610094600480360360208110156100bc57600080fd5b503561013d565b6100e6600480360360408110156100d957600080fd5b508035906020013561015a565b604080519115158252519081900360200190f35b6100e66004803603604081101561011057600080fd5b5080359060200135610198565b60028101548154600091610137919063ffffffff6101b816565b92915050565b6000610137826002015483600101546101b890919063ffffffff16565b60008181526020839052604081206001015461017857506000610137565b600082815260208490526040902061018f9061013d565b43119392505050565b60008181526020839052604081206101af9061011d565b43109392505050565b6000828201838110156101ca57600080fd5b939250505056fea165627a7a723058200c72365bac81c6f5ae1a1f80239d922cba559e27ff6eb2a367be77a6da74cc250029",
-  "address": "0xBDFeAc66c022165Bdb320264398977bf8A54e3C0",
-  "implementation": "0xBDFeAc66c022165Bdb320264398977bf8A54e3C0",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/EpochLibrary.kovan.json b/artifacts/EpochLibrary.kovan.json
deleted file mode 100644
index 8ee0830..0000000
--- a/artifacts/EpochLibrary.kovan.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "EpochLibrary",
-  "abi": [],
-  "bytecode": "0x6101fd610026600b82828239805160001a60731461001957fe5b30600052607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610072577c010000000000000000000000000000000000000000000000000000000060003504631e6af9c1811461007757806338ac766b146100a6578063dde77bf0146100c3578063f3b68c95146100fa575b600080fd5b6100946004803603602081101561008d57600080fd5b503561011d565b60408051918252519081900360200190f35b610094600480360360208110156100bc57600080fd5b503561013d565b6100e6600480360360408110156100d957600080fd5b508035906020013561015a565b604080519115158252519081900360200190f35b6100e66004803603604081101561011057600080fd5b5080359060200135610198565b60028101548154600091610137919063ffffffff6101b816565b92915050565b6000610137826002015483600101546101b890919063ffffffff16565b60008181526020839052604081206001015461017857506000610137565b600082815260208490526040902061018f9061013d565b43119392505050565b60008181526020839052604081206101af9061011d565b43109392505050565b6000828201838110156101ca57600080fd5b939250505056fea165627a7a723058200c72365bac81c6f5ae1a1f80239d922cba559e27ff6eb2a367be77a6da74cc250029",
-  "address": "0x44Ca6882823a2d7864376893A4BCF3eB377693e4",
-  "implementation": "0x44Ca6882823a2d7864376893A4BCF3eB377693e4",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/EpochLibrary.mainnet.json b/artifacts/EpochLibrary.mainnet.json
deleted file mode 100644
index 8ccf486..0000000
--- a/artifacts/EpochLibrary.mainnet.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "EpochLibrary",
-  "abi": [],
-  "bytecode": "0x6101fd610026600b82828239805160001a60731461001957fe5b30600052607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610072577c010000000000000000000000000000000000000000000000000000000060003504631e6af9c1811461007757806338ac766b146100a6578063dde77bf0146100c3578063f3b68c95146100fa575b600080fd5b6100946004803603602081101561008d57600080fd5b503561011d565b60408051918252519081900360200190f35b610094600480360360208110156100bc57600080fd5b503561013d565b6100e6600480360360408110156100d957600080fd5b508035906020013561015a565b604080519115158252519081900360200190f35b6100e66004803603604081101561011057600080fd5b5080359060200135610198565b60028101548154600091610137919063ffffffff6101b816565b92915050565b6000610137826002015483600101546101b890919063ffffffff16565b60008181526020839052604081206001015461017857506000610137565b600082815260208490526040902061018f9061013d565b43119392505050565b60008181526020839052604081206101af9061011d565b43109392505050565b6000828201838110156101ca57600080fd5b939250505056fea165627a7a723058200c72365bac81c6f5ae1a1f80239d922cba559e27ff6eb2a367be77a6da74cc250029",
-  "address": "0xb5096b69638689eE2dC7CA56Babaf7d8521a7Abb",
-  "implementation": "0xb5096b69638689eE2dC7CA56Babaf7d8521a7Abb",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/EpochLibrary.nile.json b/artifacts/EpochLibrary.nile.json
deleted file mode 100644
index d6da53b..0000000
--- a/artifacts/EpochLibrary.nile.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "EpochLibrary",
-  "abi": [],
-  "bytecode": "0x6101fd610026600b82828239805160001a60731461001957fe5b30600052607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610072577c010000000000000000000000000000000000000000000000000000000060003504631e6af9c1811461007757806338ac766b146100a6578063dde77bf0146100c3578063f3b68c95146100fa575b600080fd5b6100946004803603602081101561008d57600080fd5b503561011d565b60408051918252519081900360200190f35b610094600480360360208110156100bc57600080fd5b503561013d565b6100e6600480360360408110156100d957600080fd5b508035906020013561015a565b604080519115158252519081900360200190f35b6100e66004803603604081101561011057600080fd5b5080359060200135610198565b60028101548154600091610137919063ffffffff6101b816565b92915050565b6000610137826002015483600101546101b890919063ffffffff16565b60008181526020839052604081206001015461017857506000610137565b600082815260208490526040902061018f9061013d565b43119392505050565b60008181526020839052604081206101af9061011d565b43109392505050565b6000828201838110156101ca57600080fd5b939250505056fea165627a7a723058200c72365bac81c6f5ae1a1f80239d922cba559e27ff6eb2a367be77a6da74cc250029",
-  "address": "0xAA2C7e6237c22901533400AA9E381327A7B7982F",
-  "implementation": "0xAA2C7e6237c22901533400AA9E381327A7B7982F",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/EpochLibrary.pacific.json b/artifacts/EpochLibrary.pacific.json
deleted file mode 100644
index 858fb5d..0000000
--- a/artifacts/EpochLibrary.pacific.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "EpochLibrary",
-  "abi": [],
-  "bytecode": "0x6101fd610026600b82828239805160001a60731461001957fe5b30600052607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610072577c010000000000000000000000000000000000000000000000000000000060003504631e6af9c1811461007757806338ac766b146100a6578063dde77bf0146100c3578063f3b68c95146100fa575b600080fd5b6100946004803603602081101561008d57600080fd5b503561011d565b60408051918252519081900360200190f35b610094600480360360208110156100bc57600080fd5b503561013d565b6100e6600480360360408110156100d957600080fd5b508035906020013561015a565b604080519115158252519081900360200190f35b6100e66004803603604081101561011057600080fd5b5080359060200135610198565b60028101548154600091610137919063ffffffff6101b816565b92915050565b6000610137826002015483600101546101b890919063ffffffff16565b60008181526020839052604081206001015461017857506000610137565b600082815260208490526040902061018f9061013d565b43119392505050565b60008181526020839052604081206101af9061011d565b43109392505050565b6000828201838110156101ca57600080fd5b939250505056fea165627a7a723058200c72365bac81c6f5ae1a1f80239d922cba559e27ff6eb2a367be77a6da74cc250029",
-  "address": "0x8008F1AbD5DE59eF4546d440A124799CEcA82Adb",
-  "implementation": "0x8008F1AbD5DE59eF4546d440A124799CEcA82Adb",
-  "version": "v0.10.3"
-}
\ No newline at end of file
diff --git a/artifacts/EscrowAccessSecretStoreTemplate.duero.json b/artifacts/EscrowAccessSecretStoreTemplate.duero.json
deleted file mode 100644
index 46831ad..0000000
--- a/artifacts/EscrowAccessSecretStoreTemplate.duero.json
+++ /dev/null
@@ -1,283 +0,0 @@
-{
-  "name": "EscrowAccessSecretStoreTemplate",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getConditionTypes",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x91a169bf"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_accessConsumer",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_accessProvider",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "indexed": false,
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        }
-      ],
-      "name": "AgreementCreated",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_agreementStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_didRegistryAddress",
-          "type": "address"
-        },
-        {
-          "name": "_accessSecretStoreConditionAddress",
-          "type": "address"
-        },
-        {
-          "name": "_lockRewardConditionAddress",
-          "type": "address"
-        },
-        {
-          "name": "_escrowRewardAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xcc2a9a5b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        }
-      ],
-      "name": "createAgreement",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x2e166f3e"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_accessConsumer",
-          "type": "address"
-        }
-      ],
-      "name": "createAgreement",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4183e72b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreementData",
-      "outputs": [
-        {
-          "name": "accessConsumer",
-          "type": "address"
-        },
-        {
-          "name": "accessProvider",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6ff015ae"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506110aa806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c0100000000000000000000000000000000000000000000000000000000900480638f32d59b116100835780638f32d59b146104bc57806391a169bf146104d8578063c4d66de814610530578063cc2a9a5b14610556578063f2fde38b146105a4576100bb565b80632e166f3e146100c05780634183e72b146102895780636ff015ae1461044b578063715018a61461048e5780638da5cb5b14610498575b600080fd5b610277600480360360a08110156100d657600080fd5b8135916020810135918101906060810160408201356401000000008111156100fd57600080fd5b82018360208201111561010f57600080fd5b8035906020019184602083028401116401000000008311171561013157600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561018157600080fd5b82018360208201111561019357600080fd5b803590602001918460208302840111640100000000831117156101b557600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561020557600080fd5b82018360208201111561021757600080fd5b8035906020019184602083028401116401000000008311171561023957600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295506105ca945050505050565b60408051918252519081900360200190f35b610277600480360360c081101561029f57600080fd5b8135916020810135918101906060810160408201356401000000008111156102c657600080fd5b8201836020820111156102d857600080fd5b803590602001918460208302840111640100000000831117156102fa57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561034a57600080fd5b82018360208201111561035c57600080fd5b8035906020019184602083028401116401000000008311171561037e57600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156103ce57600080fd5b8201836020820111156103e057600080fd5b8035906020019184602083028401116401000000008311171561040257600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092955050509035600160a060020a0316915061078e9050565b6104686004803603602081101561046157600080fd5b5035610b0d565b60408051600160a060020a03938416815291909216602082015281519081900390910190f35b610496610b34565b005b6104a0610b9c565b60408051600160a060020a039092168252519081900360200190f35b6104c4610bab565b604080519115158252519081900360200190f35b6104e0610bbc565b60408051602080825283518183015283519192839290830191858101910280838360005b8381101561051c578181015183820152602001610504565b505050509050019250505060405180910390f35b6104966004803603602081101561054657600080fd5b5035600160a060020a0316610c1e565b610496600480360360c081101561056c57600080fd5b50600160a060020a038135811691602081013582169160408201358116916060810135821691608082013581169160a0013516610d37565b610496600480360360208110156105ba57600080fd5b5035600160a060020a0316610fb1565b606954600090600160a060020a031663955d0c2a87876105e8610bbc565b8888886040518763ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018087815260200186815260200180602001806020018060200180602001858103855289818151815260200191508051906020019060200280838360005b8381101561066e578181015183820152602001610656565b50505050905001858103845288818151815260200191508051906020019060200280838360005b838110156106ad578181015183820152602001610695565b50505050905001858103835287818151815260200191508051906020019060200280838360005b838110156106ec5781810151838201526020016106d4565b50505050905001858103825286818151815260200191508051906020019060200280838360005b8381101561072b578181015183820152602001610713565b505050509050019a5050505050505050505050602060405180830381600087803b15801561075857600080fd5b505af115801561076c573d6000803e3d6000fd5b505050506040513d602081101561078257600080fd5b50519695505050505050565b600061079d87878787876105ca565b50606a54604080517f22c6b519000000000000000000000000000000000000000000000000000000008152600481018990529051600092606092600160a060020a03909116916322c6b519916024808201928792909190829003018186803b15801561080857600080fd5b505afa15801561081c573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405260a081101561084557600080fd5b81516020830151604084015160608501516080860180519496939592949193928301929164010000000081111561087b57600080fd5b8201602081018481111561088e57600080fd5b81518560208202830111640100000000821117156108ab57600080fd5b5050929190505050909192509091509050809250819350505083606e60000160008b815260200190815260200160002060000160006101000a815481600160a060020a030219169083600160a060020a03160217905550600081511115610966578060008151811061091957fe5b60209081029190910181015160008b8152606e9092526040909120600101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0390921691909117905561099e565b6000898152606e60205260409020600101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384161790555b606e600101899080600181540180825580915050906001820390600052602060002001600090919290919091505550606e60000160008a815260200190815260200160002060010160009054906101000a9004600160a060020a0316600160a060020a0316606e60000160008b815260200190815260200160002060000160009054906101000a9004600160a060020a0316600160a060020a03168a7f8b2add0dadc410067e1f705e52778a4c664672e150637c62a572cfb6101cecc68b8a8a604051808481526020018060200180602001838103835285818151815260200191508051906020019060200280838360005b83811015610aa8578181015183820152602001610a90565b50505050905001838103825284818151815260200191508051906020019060200280838360005b83811015610ae7578181015183820152602001610acf565b505050509050019550505050505060405180910390a45050606f54979650505050505050565b6000908152606e602052604090208054600190910154600160a060020a0391821692911690565b610b3c610bab565b610b4557600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b60606068805480602002602001604051908101604052809291908181526020018280548015610c1457602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610bf6575b5050505050905090565b600054610100900460ff1680610c375750610c37610fce565b80610c45575060005460ff16155b610c9a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602e815260200180611051602e913960400191505060405180910390fd5b600054610100900460ff16158015610cc5576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610d33576000805461ff00191690555b5050565b600054610100900460ff1680610d505750610d50610fce565b80610d5e575060005460ff16155b610db3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602e815260200180611051602e913960400191505060405180910390fd5b600054610100900460ff16158015610dde576000805460ff1961ff0019909116610100171660011790555b600160a060020a03871615801590610dfe5750600160a060020a03861615155b8015610e125750600160a060020a03851615155b8015610e265750600160a060020a03841615155b8015610e3a5750600160a060020a03831615155b8015610e4e5750600160a060020a03821615155b610eb957604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b610ec287610c1e565b6069805473ffffffffffffffffffffffffffffffffffffffff19908116600160a060020a0389811691909117909255606a80548216888416179055606b805482168784161790819055606c80548316878516178155606d80548416878616178155606880546001818101835560008390527fa2153420d844928b4421650203c77babc8b33d7f2e7b450e2966db0c220977539182018054968916968816969096179095559254815480860183558401805491881691871691909117905590548154938401909155910180549190931691161790558015610fa8576000805461ff00191690555b50505050505050565b610fb9610bab565b610fc257600080fd5b610fcb81610fd4565b50565b303b1590565b600160a060020a038116610fe757600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582028c7e52b2cfa4f1d7f3333c1f467ed880e128fb065c0067b7acfb7e03cd2ca3c0029",
-  "address": "0xdAAb92eABB4F2D7fC51948E44A88aa4fd986EDa9",
-  "implementation": "0x3b47c2Bf50FA338E621F7Cd59b55E79EB8EbdB86",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/EscrowAccessSecretStoreTemplate.kovan.json b/artifacts/EscrowAccessSecretStoreTemplate.kovan.json
deleted file mode 100644
index 6a4a81e..0000000
--- a/artifacts/EscrowAccessSecretStoreTemplate.kovan.json
+++ /dev/null
@@ -1,283 +0,0 @@
-{
-  "name": "EscrowAccessSecretStoreTemplate",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getConditionTypes",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x91a169bf"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_accessConsumer",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_accessProvider",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "indexed": false,
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        }
-      ],
-      "name": "AgreementCreated",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_agreementStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_didRegistryAddress",
-          "type": "address"
-        },
-        {
-          "name": "_accessSecretStoreConditionAddress",
-          "type": "address"
-        },
-        {
-          "name": "_lockRewardConditionAddress",
-          "type": "address"
-        },
-        {
-          "name": "_escrowRewardAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xcc2a9a5b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        }
-      ],
-      "name": "createAgreement",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x2e166f3e"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_accessConsumer",
-          "type": "address"
-        }
-      ],
-      "name": "createAgreement",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4183e72b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreementData",
-      "outputs": [
-        {
-          "name": "accessConsumer",
-          "type": "address"
-        },
-        {
-          "name": "accessProvider",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6ff015ae"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506110aa806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c0100000000000000000000000000000000000000000000000000000000900480638f32d59b116100835780638f32d59b146104bc57806391a169bf146104d8578063c4d66de814610530578063cc2a9a5b14610556578063f2fde38b146105a4576100bb565b80632e166f3e146100c05780634183e72b146102895780636ff015ae1461044b578063715018a61461048e5780638da5cb5b14610498575b600080fd5b610277600480360360a08110156100d657600080fd5b8135916020810135918101906060810160408201356401000000008111156100fd57600080fd5b82018360208201111561010f57600080fd5b8035906020019184602083028401116401000000008311171561013157600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561018157600080fd5b82018360208201111561019357600080fd5b803590602001918460208302840111640100000000831117156101b557600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561020557600080fd5b82018360208201111561021757600080fd5b8035906020019184602083028401116401000000008311171561023957600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295506105ca945050505050565b60408051918252519081900360200190f35b610277600480360360c081101561029f57600080fd5b8135916020810135918101906060810160408201356401000000008111156102c657600080fd5b8201836020820111156102d857600080fd5b803590602001918460208302840111640100000000831117156102fa57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561034a57600080fd5b82018360208201111561035c57600080fd5b8035906020019184602083028401116401000000008311171561037e57600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156103ce57600080fd5b8201836020820111156103e057600080fd5b8035906020019184602083028401116401000000008311171561040257600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092955050509035600160a060020a0316915061078e9050565b6104686004803603602081101561046157600080fd5b5035610b0d565b60408051600160a060020a03938416815291909216602082015281519081900390910190f35b610496610b34565b005b6104a0610b9c565b60408051600160a060020a039092168252519081900360200190f35b6104c4610bab565b604080519115158252519081900360200190f35b6104e0610bbc565b60408051602080825283518183015283519192839290830191858101910280838360005b8381101561051c578181015183820152602001610504565b505050509050019250505060405180910390f35b6104966004803603602081101561054657600080fd5b5035600160a060020a0316610c1e565b610496600480360360c081101561056c57600080fd5b50600160a060020a038135811691602081013582169160408201358116916060810135821691608082013581169160a0013516610d37565b610496600480360360208110156105ba57600080fd5b5035600160a060020a0316610fb1565b606954600090600160a060020a031663955d0c2a87876105e8610bbc565b8888886040518763ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018087815260200186815260200180602001806020018060200180602001858103855289818151815260200191508051906020019060200280838360005b8381101561066e578181015183820152602001610656565b50505050905001858103845288818151815260200191508051906020019060200280838360005b838110156106ad578181015183820152602001610695565b50505050905001858103835287818151815260200191508051906020019060200280838360005b838110156106ec5781810151838201526020016106d4565b50505050905001858103825286818151815260200191508051906020019060200280838360005b8381101561072b578181015183820152602001610713565b505050509050019a5050505050505050505050602060405180830381600087803b15801561075857600080fd5b505af115801561076c573d6000803e3d6000fd5b505050506040513d602081101561078257600080fd5b50519695505050505050565b600061079d87878787876105ca565b50606a54604080517f22c6b519000000000000000000000000000000000000000000000000000000008152600481018990529051600092606092600160a060020a03909116916322c6b519916024808201928792909190829003018186803b15801561080857600080fd5b505afa15801561081c573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405260a081101561084557600080fd5b81516020830151604084015160608501516080860180519496939592949193928301929164010000000081111561087b57600080fd5b8201602081018481111561088e57600080fd5b81518560208202830111640100000000821117156108ab57600080fd5b5050929190505050909192509091509050809250819350505083606e60000160008b815260200190815260200160002060000160006101000a815481600160a060020a030219169083600160a060020a03160217905550600081511115610966578060008151811061091957fe5b60209081029190910181015160008b8152606e9092526040909120600101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0390921691909117905561099e565b6000898152606e60205260409020600101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384161790555b606e600101899080600181540180825580915050906001820390600052602060002001600090919290919091505550606e60000160008a815260200190815260200160002060010160009054906101000a9004600160a060020a0316600160a060020a0316606e60000160008b815260200190815260200160002060000160009054906101000a9004600160a060020a0316600160a060020a03168a7f8b2add0dadc410067e1f705e52778a4c664672e150637c62a572cfb6101cecc68b8a8a604051808481526020018060200180602001838103835285818151815260200191508051906020019060200280838360005b83811015610aa8578181015183820152602001610a90565b50505050905001838103825284818151815260200191508051906020019060200280838360005b83811015610ae7578181015183820152602001610acf565b505050509050019550505050505060405180910390a45050606f54979650505050505050565b6000908152606e602052604090208054600190910154600160a060020a0391821692911690565b610b3c610bab565b610b4557600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b60606068805480602002602001604051908101604052809291908181526020018280548015610c1457602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610bf6575b5050505050905090565b600054610100900460ff1680610c375750610c37610fce565b80610c45575060005460ff16155b610c9a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602e815260200180611051602e913960400191505060405180910390fd5b600054610100900460ff16158015610cc5576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610d33576000805461ff00191690555b5050565b600054610100900460ff1680610d505750610d50610fce565b80610d5e575060005460ff16155b610db3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602e815260200180611051602e913960400191505060405180910390fd5b600054610100900460ff16158015610dde576000805460ff1961ff0019909116610100171660011790555b600160a060020a03871615801590610dfe5750600160a060020a03861615155b8015610e125750600160a060020a03851615155b8015610e265750600160a060020a03841615155b8015610e3a5750600160a060020a03831615155b8015610e4e5750600160a060020a03821615155b610eb957604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b610ec287610c1e565b6069805473ffffffffffffffffffffffffffffffffffffffff19908116600160a060020a0389811691909117909255606a80548216888416179055606b805482168784161790819055606c80548316878516178155606d80548416878616178155606880546001818101835560008390527fa2153420d844928b4421650203c77babc8b33d7f2e7b450e2966db0c220977539182018054968916968816969096179095559254815480860183558401805491881691871691909117905590548154938401909155910180549190931691161790558015610fa8576000805461ff00191690555b50505050505050565b610fb9610bab565b610fc257600080fd5b610fcb81610fd4565b50565b303b1590565b600160a060020a038116610fe757600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582028c7e52b2cfa4f1d7f3333c1f467ed880e128fb065c0067b7acfb7e03cd2ca3c0029",
-  "address": "0xe0Afe9a948f9Fa39524c8d29a98d75409018ABf0",
-  "implementation": "0xEAE107FC11AcCA98734F4024661b71a7b1D89d47",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/EscrowAccessSecretStoreTemplate.mainnet.json b/artifacts/EscrowAccessSecretStoreTemplate.mainnet.json
deleted file mode 100644
index 033e08c..0000000
--- a/artifacts/EscrowAccessSecretStoreTemplate.mainnet.json
+++ /dev/null
@@ -1,283 +0,0 @@
-{
-  "name": "EscrowAccessSecretStoreTemplate",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getConditionTypes",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x91a169bf"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_accessConsumer",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_accessProvider",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "indexed": false,
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        }
-      ],
-      "name": "AgreementCreated",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_agreementStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_didRegistryAddress",
-          "type": "address"
-        },
-        {
-          "name": "_accessSecretStoreConditionAddress",
-          "type": "address"
-        },
-        {
-          "name": "_lockRewardConditionAddress",
-          "type": "address"
-        },
-        {
-          "name": "_escrowRewardAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xcc2a9a5b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        }
-      ],
-      "name": "createAgreement",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x2e166f3e"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_accessConsumer",
-          "type": "address"
-        }
-      ],
-      "name": "createAgreement",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4183e72b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreementData",
-      "outputs": [
-        {
-          "name": "accessConsumer",
-          "type": "address"
-        },
-        {
-          "name": "accessProvider",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6ff015ae"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506110aa806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c0100000000000000000000000000000000000000000000000000000000900480638f32d59b116100835780638f32d59b146104bc57806391a169bf146104d8578063c4d66de814610530578063cc2a9a5b14610556578063f2fde38b146105a4576100bb565b80632e166f3e146100c05780634183e72b146102895780636ff015ae1461044b578063715018a61461048e5780638da5cb5b14610498575b600080fd5b610277600480360360a08110156100d657600080fd5b8135916020810135918101906060810160408201356401000000008111156100fd57600080fd5b82018360208201111561010f57600080fd5b8035906020019184602083028401116401000000008311171561013157600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561018157600080fd5b82018360208201111561019357600080fd5b803590602001918460208302840111640100000000831117156101b557600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561020557600080fd5b82018360208201111561021757600080fd5b8035906020019184602083028401116401000000008311171561023957600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295506105ca945050505050565b60408051918252519081900360200190f35b610277600480360360c081101561029f57600080fd5b8135916020810135918101906060810160408201356401000000008111156102c657600080fd5b8201836020820111156102d857600080fd5b803590602001918460208302840111640100000000831117156102fa57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561034a57600080fd5b82018360208201111561035c57600080fd5b8035906020019184602083028401116401000000008311171561037e57600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156103ce57600080fd5b8201836020820111156103e057600080fd5b8035906020019184602083028401116401000000008311171561040257600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092955050509035600160a060020a0316915061078e9050565b6104686004803603602081101561046157600080fd5b5035610b0d565b60408051600160a060020a03938416815291909216602082015281519081900390910190f35b610496610b34565b005b6104a0610b9c565b60408051600160a060020a039092168252519081900360200190f35b6104c4610bab565b604080519115158252519081900360200190f35b6104e0610bbc565b60408051602080825283518183015283519192839290830191858101910280838360005b8381101561051c578181015183820152602001610504565b505050509050019250505060405180910390f35b6104966004803603602081101561054657600080fd5b5035600160a060020a0316610c1e565b610496600480360360c081101561056c57600080fd5b50600160a060020a038135811691602081013582169160408201358116916060810135821691608082013581169160a0013516610d37565b610496600480360360208110156105ba57600080fd5b5035600160a060020a0316610fb1565b606954600090600160a060020a031663955d0c2a87876105e8610bbc565b8888886040518763ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018087815260200186815260200180602001806020018060200180602001858103855289818151815260200191508051906020019060200280838360005b8381101561066e578181015183820152602001610656565b50505050905001858103845288818151815260200191508051906020019060200280838360005b838110156106ad578181015183820152602001610695565b50505050905001858103835287818151815260200191508051906020019060200280838360005b838110156106ec5781810151838201526020016106d4565b50505050905001858103825286818151815260200191508051906020019060200280838360005b8381101561072b578181015183820152602001610713565b505050509050019a5050505050505050505050602060405180830381600087803b15801561075857600080fd5b505af115801561076c573d6000803e3d6000fd5b505050506040513d602081101561078257600080fd5b50519695505050505050565b600061079d87878787876105ca565b50606a54604080517f22c6b519000000000000000000000000000000000000000000000000000000008152600481018990529051600092606092600160a060020a03909116916322c6b519916024808201928792909190829003018186803b15801561080857600080fd5b505afa15801561081c573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405260a081101561084557600080fd5b81516020830151604084015160608501516080860180519496939592949193928301929164010000000081111561087b57600080fd5b8201602081018481111561088e57600080fd5b81518560208202830111640100000000821117156108ab57600080fd5b5050929190505050909192509091509050809250819350505083606e60000160008b815260200190815260200160002060000160006101000a815481600160a060020a030219169083600160a060020a03160217905550600081511115610966578060008151811061091957fe5b60209081029190910181015160008b8152606e9092526040909120600101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0390921691909117905561099e565b6000898152606e60205260409020600101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384161790555b606e600101899080600181540180825580915050906001820390600052602060002001600090919290919091505550606e60000160008a815260200190815260200160002060010160009054906101000a9004600160a060020a0316600160a060020a0316606e60000160008b815260200190815260200160002060000160009054906101000a9004600160a060020a0316600160a060020a03168a7f8b2add0dadc410067e1f705e52778a4c664672e150637c62a572cfb6101cecc68b8a8a604051808481526020018060200180602001838103835285818151815260200191508051906020019060200280838360005b83811015610aa8578181015183820152602001610a90565b50505050905001838103825284818151815260200191508051906020019060200280838360005b83811015610ae7578181015183820152602001610acf565b505050509050019550505050505060405180910390a45050606f54979650505050505050565b6000908152606e602052604090208054600190910154600160a060020a0391821692911690565b610b3c610bab565b610b4557600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b60606068805480602002602001604051908101604052809291908181526020018280548015610c1457602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610bf6575b5050505050905090565b600054610100900460ff1680610c375750610c37610fce565b80610c45575060005460ff16155b610c9a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602e815260200180611051602e913960400191505060405180910390fd5b600054610100900460ff16158015610cc5576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610d33576000805461ff00191690555b5050565b600054610100900460ff1680610d505750610d50610fce565b80610d5e575060005460ff16155b610db3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602e815260200180611051602e913960400191505060405180910390fd5b600054610100900460ff16158015610dde576000805460ff1961ff0019909116610100171660011790555b600160a060020a03871615801590610dfe5750600160a060020a03861615155b8015610e125750600160a060020a03851615155b8015610e265750600160a060020a03841615155b8015610e3a5750600160a060020a03831615155b8015610e4e5750600160a060020a03821615155b610eb957604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b610ec287610c1e565b6069805473ffffffffffffffffffffffffffffffffffffffff19908116600160a060020a0389811691909117909255606a80548216888416179055606b805482168784161790819055606c80548316878516178155606d80548416878616178155606880546001818101835560008390527fa2153420d844928b4421650203c77babc8b33d7f2e7b450e2966db0c220977539182018054968916968816969096179095559254815480860183558401805491881691871691909117905590548154938401909155910180549190931691161790558015610fa8576000805461ff00191690555b50505050505050565b610fb9610bab565b610fc257600080fd5b610fcb81610fd4565b50565b303b1590565b600160a060020a038116610fe757600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582028c7e52b2cfa4f1d7f3333c1f467ed880e128fb065c0067b7acfb7e03cd2ca3c0029",
-  "address": "0xa713D8F4791512a599A98f5DcaCC6401D6c76e5f",
-  "implementation": "0xb78586946809836e407324b3B142913d08b19486",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/EscrowAccessSecretStoreTemplate.nile.json b/artifacts/EscrowAccessSecretStoreTemplate.nile.json
deleted file mode 100644
index b927066..0000000
--- a/artifacts/EscrowAccessSecretStoreTemplate.nile.json
+++ /dev/null
@@ -1,283 +0,0 @@
-{
-  "name": "EscrowAccessSecretStoreTemplate",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getConditionTypes",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x91a169bf"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_accessConsumer",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_accessProvider",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "indexed": false,
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        }
-      ],
-      "name": "AgreementCreated",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_agreementStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_didRegistryAddress",
-          "type": "address"
-        },
-        {
-          "name": "_accessSecretStoreConditionAddress",
-          "type": "address"
-        },
-        {
-          "name": "_lockRewardConditionAddress",
-          "type": "address"
-        },
-        {
-          "name": "_escrowRewardAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xcc2a9a5b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        }
-      ],
-      "name": "createAgreement",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x2e166f3e"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_accessConsumer",
-          "type": "address"
-        }
-      ],
-      "name": "createAgreement",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4183e72b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreementData",
-      "outputs": [
-        {
-          "name": "accessConsumer",
-          "type": "address"
-        },
-        {
-          "name": "accessProvider",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6ff015ae"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506110aa806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c0100000000000000000000000000000000000000000000000000000000900480638f32d59b116100835780638f32d59b146104bc57806391a169bf146104d8578063c4d66de814610530578063cc2a9a5b14610556578063f2fde38b146105a4576100bb565b80632e166f3e146100c05780634183e72b146102895780636ff015ae1461044b578063715018a61461048e5780638da5cb5b14610498575b600080fd5b610277600480360360a08110156100d657600080fd5b8135916020810135918101906060810160408201356401000000008111156100fd57600080fd5b82018360208201111561010f57600080fd5b8035906020019184602083028401116401000000008311171561013157600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561018157600080fd5b82018360208201111561019357600080fd5b803590602001918460208302840111640100000000831117156101b557600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561020557600080fd5b82018360208201111561021757600080fd5b8035906020019184602083028401116401000000008311171561023957600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295506105ca945050505050565b60408051918252519081900360200190f35b610277600480360360c081101561029f57600080fd5b8135916020810135918101906060810160408201356401000000008111156102c657600080fd5b8201836020820111156102d857600080fd5b803590602001918460208302840111640100000000831117156102fa57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561034a57600080fd5b82018360208201111561035c57600080fd5b8035906020019184602083028401116401000000008311171561037e57600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156103ce57600080fd5b8201836020820111156103e057600080fd5b8035906020019184602083028401116401000000008311171561040257600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092955050509035600160a060020a0316915061078e9050565b6104686004803603602081101561046157600080fd5b5035610b0d565b60408051600160a060020a03938416815291909216602082015281519081900390910190f35b610496610b34565b005b6104a0610b9c565b60408051600160a060020a039092168252519081900360200190f35b6104c4610bab565b604080519115158252519081900360200190f35b6104e0610bbc565b60408051602080825283518183015283519192839290830191858101910280838360005b8381101561051c578181015183820152602001610504565b505050509050019250505060405180910390f35b6104966004803603602081101561054657600080fd5b5035600160a060020a0316610c1e565b610496600480360360c081101561056c57600080fd5b50600160a060020a038135811691602081013582169160408201358116916060810135821691608082013581169160a0013516610d37565b610496600480360360208110156105ba57600080fd5b5035600160a060020a0316610fb1565b606954600090600160a060020a031663955d0c2a87876105e8610bbc565b8888886040518763ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018087815260200186815260200180602001806020018060200180602001858103855289818151815260200191508051906020019060200280838360005b8381101561066e578181015183820152602001610656565b50505050905001858103845288818151815260200191508051906020019060200280838360005b838110156106ad578181015183820152602001610695565b50505050905001858103835287818151815260200191508051906020019060200280838360005b838110156106ec5781810151838201526020016106d4565b50505050905001858103825286818151815260200191508051906020019060200280838360005b8381101561072b578181015183820152602001610713565b505050509050019a5050505050505050505050602060405180830381600087803b15801561075857600080fd5b505af115801561076c573d6000803e3d6000fd5b505050506040513d602081101561078257600080fd5b50519695505050505050565b600061079d87878787876105ca565b50606a54604080517f22c6b519000000000000000000000000000000000000000000000000000000008152600481018990529051600092606092600160a060020a03909116916322c6b519916024808201928792909190829003018186803b15801561080857600080fd5b505afa15801561081c573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405260a081101561084557600080fd5b81516020830151604084015160608501516080860180519496939592949193928301929164010000000081111561087b57600080fd5b8201602081018481111561088e57600080fd5b81518560208202830111640100000000821117156108ab57600080fd5b5050929190505050909192509091509050809250819350505083606e60000160008b815260200190815260200160002060000160006101000a815481600160a060020a030219169083600160a060020a03160217905550600081511115610966578060008151811061091957fe5b60209081029190910181015160008b8152606e9092526040909120600101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0390921691909117905561099e565b6000898152606e60205260409020600101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384161790555b606e600101899080600181540180825580915050906001820390600052602060002001600090919290919091505550606e60000160008a815260200190815260200160002060010160009054906101000a9004600160a060020a0316600160a060020a0316606e60000160008b815260200190815260200160002060000160009054906101000a9004600160a060020a0316600160a060020a03168a7f8b2add0dadc410067e1f705e52778a4c664672e150637c62a572cfb6101cecc68b8a8a604051808481526020018060200180602001838103835285818151815260200191508051906020019060200280838360005b83811015610aa8578181015183820152602001610a90565b50505050905001838103825284818151815260200191508051906020019060200280838360005b83811015610ae7578181015183820152602001610acf565b505050509050019550505050505060405180910390a45050606f54979650505050505050565b6000908152606e602052604090208054600190910154600160a060020a0391821692911690565b610b3c610bab565b610b4557600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b60606068805480602002602001604051908101604052809291908181526020018280548015610c1457602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610bf6575b5050505050905090565b600054610100900460ff1680610c375750610c37610fce565b80610c45575060005460ff16155b610c9a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602e815260200180611051602e913960400191505060405180910390fd5b600054610100900460ff16158015610cc5576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610d33576000805461ff00191690555b5050565b600054610100900460ff1680610d505750610d50610fce565b80610d5e575060005460ff16155b610db3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602e815260200180611051602e913960400191505060405180910390fd5b600054610100900460ff16158015610dde576000805460ff1961ff0019909116610100171660011790555b600160a060020a03871615801590610dfe5750600160a060020a03861615155b8015610e125750600160a060020a03851615155b8015610e265750600160a060020a03841615155b8015610e3a5750600160a060020a03831615155b8015610e4e5750600160a060020a03821615155b610eb957604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b610ec287610c1e565b6069805473ffffffffffffffffffffffffffffffffffffffff19908116600160a060020a0389811691909117909255606a80548216888416179055606b805482168784161790819055606c80548316878516178155606d80548416878616178155606880546001818101835560008390527fa2153420d844928b4421650203c77babc8b33d7f2e7b450e2966db0c220977539182018054968916968816969096179095559254815480860183558401805491881691871691909117905590548154938401909155910180549190931691161790558015610fa8576000805461ff00191690555b50505050505050565b610fb9610bab565b610fc257600080fd5b610fcb81610fd4565b50565b303b1590565b600160a060020a038116610fe757600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582028c7e52b2cfa4f1d7f3333c1f467ed880e128fb065c0067b7acfb7e03cd2ca3c0029",
-  "address": "0xfA16d26e9F4fffC6e40963B281a0bB08C31ed40C",
-  "implementation": "0x6A84C68C28bd6d4f3615F9867553D7f5162CB702",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/EscrowAccessSecretStoreTemplate.pacific.json b/artifacts/EscrowAccessSecretStoreTemplate.pacific.json
deleted file mode 100644
index 0c29e94..0000000
--- a/artifacts/EscrowAccessSecretStoreTemplate.pacific.json
+++ /dev/null
@@ -1,283 +0,0 @@
-{
-  "name": "EscrowAccessSecretStoreTemplate",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getConditionTypes",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address[]"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x91a169bf"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_accessConsumer",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "_accessProvider",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "indexed": false,
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        }
-      ],
-      "name": "AgreementCreated",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_agreementStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_didRegistryAddress",
-          "type": "address"
-        },
-        {
-          "name": "_accessSecretStoreConditionAddress",
-          "type": "address"
-        },
-        {
-          "name": "_lockRewardConditionAddress",
-          "type": "address"
-        },
-        {
-          "name": "_escrowRewardAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xcc2a9a5b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        }
-      ],
-      "name": "createAgreement",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x2e166f3e"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        },
-        {
-          "name": "_did",
-          "type": "bytes32"
-        },
-        {
-          "name": "_conditionIds",
-          "type": "bytes32[]"
-        },
-        {
-          "name": "_timeLocks",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_timeOuts",
-          "type": "uint256[]"
-        },
-        {
-          "name": "_accessConsumer",
-          "type": "address"
-        }
-      ],
-      "name": "createAgreement",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4183e72b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAgreementData",
-      "outputs": [
-        {
-          "name": "accessConsumer",
-          "type": "address"
-        },
-        {
-          "name": "accessProvider",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x6ff015ae"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506110aa806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c0100000000000000000000000000000000000000000000000000000000900480638f32d59b116100835780638f32d59b146104bc57806391a169bf146104d8578063c4d66de814610530578063cc2a9a5b14610556578063f2fde38b146105a4576100bb565b80632e166f3e146100c05780634183e72b146102895780636ff015ae1461044b578063715018a61461048e5780638da5cb5b14610498575b600080fd5b610277600480360360a08110156100d657600080fd5b8135916020810135918101906060810160408201356401000000008111156100fd57600080fd5b82018360208201111561010f57600080fd5b8035906020019184602083028401116401000000008311171561013157600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561018157600080fd5b82018360208201111561019357600080fd5b803590602001918460208302840111640100000000831117156101b557600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561020557600080fd5b82018360208201111561021757600080fd5b8035906020019184602083028401116401000000008311171561023957600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295506105ca945050505050565b60408051918252519081900360200190f35b610277600480360360c081101561029f57600080fd5b8135916020810135918101906060810160408201356401000000008111156102c657600080fd5b8201836020820111156102d857600080fd5b803590602001918460208302840111640100000000831117156102fa57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561034a57600080fd5b82018360208201111561035c57600080fd5b8035906020019184602083028401116401000000008311171561037e57600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156103ce57600080fd5b8201836020820111156103e057600080fd5b8035906020019184602083028401116401000000008311171561040257600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092955050509035600160a060020a0316915061078e9050565b6104686004803603602081101561046157600080fd5b5035610b0d565b60408051600160a060020a03938416815291909216602082015281519081900390910190f35b610496610b34565b005b6104a0610b9c565b60408051600160a060020a039092168252519081900360200190f35b6104c4610bab565b604080519115158252519081900360200190f35b6104e0610bbc565b60408051602080825283518183015283519192839290830191858101910280838360005b8381101561051c578181015183820152602001610504565b505050509050019250505060405180910390f35b6104966004803603602081101561054657600080fd5b5035600160a060020a0316610c1e565b610496600480360360c081101561056c57600080fd5b50600160a060020a038135811691602081013582169160408201358116916060810135821691608082013581169160a0013516610d37565b610496600480360360208110156105ba57600080fd5b5035600160a060020a0316610fb1565b606954600090600160a060020a031663955d0c2a87876105e8610bbc565b8888886040518763ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018087815260200186815260200180602001806020018060200180602001858103855289818151815260200191508051906020019060200280838360005b8381101561066e578181015183820152602001610656565b50505050905001858103845288818151815260200191508051906020019060200280838360005b838110156106ad578181015183820152602001610695565b50505050905001858103835287818151815260200191508051906020019060200280838360005b838110156106ec5781810151838201526020016106d4565b50505050905001858103825286818151815260200191508051906020019060200280838360005b8381101561072b578181015183820152602001610713565b505050509050019a5050505050505050505050602060405180830381600087803b15801561075857600080fd5b505af115801561076c573d6000803e3d6000fd5b505050506040513d602081101561078257600080fd5b50519695505050505050565b600061079d87878787876105ca565b50606a54604080517f22c6b519000000000000000000000000000000000000000000000000000000008152600481018990529051600092606092600160a060020a03909116916322c6b519916024808201928792909190829003018186803b15801561080857600080fd5b505afa15801561081c573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405260a081101561084557600080fd5b81516020830151604084015160608501516080860180519496939592949193928301929164010000000081111561087b57600080fd5b8201602081018481111561088e57600080fd5b81518560208202830111640100000000821117156108ab57600080fd5b5050929190505050909192509091509050809250819350505083606e60000160008b815260200190815260200160002060000160006101000a815481600160a060020a030219169083600160a060020a03160217905550600081511115610966578060008151811061091957fe5b60209081029190910181015160008b8152606e9092526040909120600101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0390921691909117905561099e565b6000898152606e60205260409020600101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384161790555b606e600101899080600181540180825580915050906001820390600052602060002001600090919290919091505550606e60000160008a815260200190815260200160002060010160009054906101000a9004600160a060020a0316600160a060020a0316606e60000160008b815260200190815260200160002060000160009054906101000a9004600160a060020a0316600160a060020a03168a7f8b2add0dadc410067e1f705e52778a4c664672e150637c62a572cfb6101cecc68b8a8a604051808481526020018060200180602001838103835285818151815260200191508051906020019060200280838360005b83811015610aa8578181015183820152602001610a90565b50505050905001838103825284818151815260200191508051906020019060200280838360005b83811015610ae7578181015183820152602001610acf565b505050509050019550505050505060405180910390a45050606f54979650505050505050565b6000908152606e602052604090208054600190910154600160a060020a0391821692911690565b610b3c610bab565b610b4557600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b60606068805480602002602001604051908101604052809291908181526020018280548015610c1457602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610bf6575b5050505050905090565b600054610100900460ff1680610c375750610c37610fce565b80610c45575060005460ff16155b610c9a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602e815260200180611051602e913960400191505060405180910390fd5b600054610100900460ff16158015610cc5576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610d33576000805461ff00191690555b5050565b600054610100900460ff1680610d505750610d50610fce565b80610d5e575060005460ff16155b610db3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602e815260200180611051602e913960400191505060405180910390fd5b600054610100900460ff16158015610dde576000805460ff1961ff0019909116610100171660011790555b600160a060020a03871615801590610dfe5750600160a060020a03861615155b8015610e125750600160a060020a03851615155b8015610e265750600160a060020a03841615155b8015610e3a5750600160a060020a03831615155b8015610e4e5750600160a060020a03821615155b610eb957604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b610ec287610c1e565b6069805473ffffffffffffffffffffffffffffffffffffffff19908116600160a060020a0389811691909117909255606a80548216888416179055606b805482168784161790819055606c80548316878516178155606d80548416878616178155606880546001818101835560008390527fa2153420d844928b4421650203c77babc8b33d7f2e7b450e2966db0c220977539182018054968916968816969096179095559254815480860183558401805491881691871691909117905590548154938401909155910180549190931691161790558015610fa8576000805461ff00191690555b50505050505050565b610fb9610bab565b610fc257600080fd5b610fcb81610fd4565b50565b303b1590565b600160a060020a038116610fe757600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582028c7e52b2cfa4f1d7f3333c1f467ed880e128fb065c0067b7acfb7e03cd2ca3c0029",
-  "address": "0x9BF43606d833489fbD568ace13f535fC41130c28",
-  "implementation": "0x15EaC01cBCC8fEB96Cb60E2dF53Af59382aa0F2F",
-  "version": "v0.10.3"
-}
\ No newline at end of file
diff --git a/artifacts/EscrowReward.duero.json b/artifacts/EscrowReward.duero.json
deleted file mode 100644
index 2ff8da9..0000000
--- a/artifacts/EscrowReward.duero.json
+++ /dev/null
@@ -1,266 +0,0 @@
-{
-  "name": "EscrowReward",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_receiver",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_conditionId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "Fulfilled",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_tokenAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc0c53b8b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_amount",
-          "type": "uint256"
-        },
-        {
-          "name": "_receiver",
-          "type": "address"
-        },
-        {
-          "name": "_sender",
-          "type": "address"
-        },
-        {
-          "name": "_lockCondition",
-          "type": "bytes32"
-        },
-        {
-          "name": "_releaseCondition",
-          "type": "bytes32"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0x22d8a6e3"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_amount",
-          "type": "uint256"
-        },
-        {
-          "name": "_receiver",
-          "type": "address"
-        },
-        {
-          "name": "_sender",
-          "type": "address"
-        },
-        {
-          "name": "_lockCondition",
-          "type": "bytes32"
-        },
-        {
-          "name": "_releaseCondition",
-          "type": "bytes32"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x2242b40e"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50611073806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c0100000000000000000000000000000000000000000000000000000000900480638f32d59b116100835780638f32d59b146101cb578063c0c53b8b146101e7578063c4d66de81461021f578063cb4e57e814610245578063f2fde38b14610268576100bb565b80631ce19185146100c05780632242b40e1461010157806322d8a6e314610149578063715018a61461019d5780638da5cb5b146101a7575b600080fd5b6100dd600480360360208110156100d657600080fd5b503561028e565b604051808260038111156100ed57fe5b60ff16815260200191505060405180910390f35b6100dd600480360360c081101561011757600080fd5b50803590602081013590600160a060020a03604082013581169160608101359091169060808101359060a00135610413565b61018b600480360360a081101561015f57600080fd5b50803590600160a060020a03602082013581169160408101359091169060608101359060800135610931565b60408051918252519081900360200190f35b6101a5610993565b005b6101af6109fb565b60408051600160a060020a039092168252519081900360200190f35b6101d3610a0a565b604080519115158252519081900360200190f35b6101a5600480360360608110156101fd57600080fd5b50600160a060020a038135811691602081013582169160409091013516610a1b565b6101a56004803603602081101561023557600080fd5b5035600160a060020a0316610b7d565b61018b6004803603604081101561025b57600080fd5b5080359060200135610c7f565b6101a56004803603602081101561027e57600080fd5b5035600160a060020a0316610cc0565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b1580156102f357600080fd5b505afa158015610307573d6000803e3d6000fd5b505050506040513d602081101561031d57600080fd5b5051610373576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b1580156103e157600080fd5b505af11580156103f5573d6000803e3d6000fd5b505050506040513d602081101561040b57600080fd5b505192915050565b60008061042c886104278989898989610931565b610c7f565b606654604080517f2934a0ee0000000000000000000000000000000000000000000000000000000081526004810188905290519293506000928392600160a060020a031691632934a0ee9160248083019260e0929190829003018186803b15801561049657600080fd5b505afa1580156104aa573d6000803e3d6000fd5b505050506040513d60e08110156104c057600080fd5b8101908080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919080519060200190929190505050909192935090919250909150905050809250819350505060008a83308c6040516020018083600160a060020a0316600160a060020a03166c0100000000000000000000000002815260140182815260200192505050604051602081830303815290604052805190602001206040516020018084815260200183600160a060020a0316600160a060020a03166c010000000000000000000000000281526014018281526020019350505050604051602081830303815290604052805190602001209050868114610626576040805160e560020a62461bcd02815260206004820152601f60248201527f4c6f636b436f6e646974696f6e20494420646f6573206e6f74206d6174636800604482015290519081900360640190fd5b600282600381111561063457fe5b146106735760405160e560020a62461bcd028152600401808060200182810382526023815260200180610ffa6023913960400191505060405180910390fd5b606754604080517f70a0823100000000000000000000000000000000000000000000000000000000815230600482015290518c92600160a060020a0316916370a08231916024808301926020929190829003018186803b1580156106d657600080fd5b505afa1580156106ea573d6000803e3d6000fd5b505050506040513d602081101561070057600080fd5b50511015610758576040805160e560020a62461bcd02815260206004820152601260248201527f4e6f7420656e6f7567682062616c616e63650000000000000000000000000000604482015290519081900360640190fd5b606654604080517f336c5122000000000000000000000000000000000000000000000000000000008152600481018990529051600092600160a060020a03169163336c5122916024808301926020929190829003018186803b1580156107bd57600080fd5b505afa1580156107d1573d6000803e3d6000fd5b505050506040513d60208110156107e757600080fd5b50519050600060028260038111156107fb57fe5b141561081557508961080e86828e610cdd565b91506108d5565b600382600381111561082357fe5b141561083657508861080e86828e610cdd565b606654604080517f336c5122000000000000000000000000000000000000000000000000000000008152600481018990529051600160a060020a039092169163336c512291602480820192602092909190829003018186803b15801561089b57600080fd5b505afa1580156108af573d6000803e3d6000fd5b505050506040513d60208110156108c557600080fd5b5051965061092795505050505050565b80600160a060020a03168d7f30489630ef1e35cf4efeec045e3f1a7523e4eb5032d43970c86c5e375361aa30888f604051808381526020018281526020019250505060405180910390a3509450505050505b9695505050505050565b6040805160208082018890526c01000000000000000000000000600160a060020a0380891682028486015287160260548301526068820185905260888083018590528351808403909101815260a8909201909252805191012095945050505050565b61099b610a0a565b6109a457600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff1680610a345750610a34610e74565b80610a42575060005460ff16155b610a805760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610fcc602e913960400191505060405180910390fd5b600054610100900460ff16158015610aab576000805460ff1961ff0019909116610100171660011790555b600160a060020a03821615801590610acb5750600160a060020a03831615155b610b1f576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b610b2884610b7d565b60668054600160a060020a0380861673ffffffffffffffffffffffffffffffffffffffff199283161790925560678054928516929091169190911790558015610b77576000805461ff00191690555b50505050565b600054610100900460ff1680610b965750610b96610e74565b80610ba4575060005460ff16155b610be25760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610fcc602e913960400191505060405180910390fd5b600054610100900460ff16158015610c0d576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610c7b576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b610cc8610a0a565b610cd157600080fd5b610cda81610e7a565b50565b6000600160a060020a038316610d275760405160e560020a62461bcd028152600401808060200182810382526025815260200180610fa76025913960400191505060405180910390fd5b600160a060020a038316301415610d725760405160e560020a62461bcd02815260040180806020018281038252602b81526020018061101d602b913960400191505060405180910390fd5b606754604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a038681166004830152602482018690529151919092169163a9059cbb9160448083019260209291908290030181600087803b158015610de157600080fd5b505af1158015610df5573d6000803e3d6000fd5b505050506040513d6020811015610e0b57600080fd5b5051610e61576040805160e560020a62461bcd02815260206004820152601860248201527f436f756c64206e6f74207472616e7366657220746f6b656e0000000000000000604482015290519081900360640190fd5b610e6c846002610ef6565b949350505050565b303b1590565b600160a060020a038116610e8d57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e46918691869190602401826003811115610f4d57fe5b60ff16815260200192505050602060405180830381600087803b158015610f7357600080fd5b505af1158015610f87573d6000803e3d6000fd5b505050506040513d6020811015610f9d57600080fd5b5051939250505056fe4e756c6c206164647265737320697320696d706f737369626c6520746f2066756c66696c6c436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a65644c6f636b436f6e646974696f6e206e6565647320746f2062652046756c66696c6c6564457363726f7752657761726420636f6e74726163742063616e206e6f742062652061207265636569766572a165627a7a72305820f5123fe56469b6025217523c032220f8cd68626c6fabfc788345611a0f02f15f0029",
-  "address": "0xb8D436b29CBF1ef690DD3b0972Cce2090ECb09bc",
-  "implementation": "0x5A63dB88e5B7E46EF613470FB5C603b7Ea020a58",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/EscrowReward.kovan.json b/artifacts/EscrowReward.kovan.json
deleted file mode 100644
index ce39850..0000000
--- a/artifacts/EscrowReward.kovan.json
+++ /dev/null
@@ -1,266 +0,0 @@
-{
-  "name": "EscrowReward",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_receiver",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_conditionId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "Fulfilled",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_tokenAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc0c53b8b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_amount",
-          "type": "uint256"
-        },
-        {
-          "name": "_receiver",
-          "type": "address"
-        },
-        {
-          "name": "_sender",
-          "type": "address"
-        },
-        {
-          "name": "_lockCondition",
-          "type": "bytes32"
-        },
-        {
-          "name": "_releaseCondition",
-          "type": "bytes32"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0x22d8a6e3"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_amount",
-          "type": "uint256"
-        },
-        {
-          "name": "_receiver",
-          "type": "address"
-        },
-        {
-          "name": "_sender",
-          "type": "address"
-        },
-        {
-          "name": "_lockCondition",
-          "type": "bytes32"
-        },
-        {
-          "name": "_releaseCondition",
-          "type": "bytes32"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x2242b40e"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50611073806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c0100000000000000000000000000000000000000000000000000000000900480638f32d59b116100835780638f32d59b146101cb578063c0c53b8b146101e7578063c4d66de81461021f578063cb4e57e814610245578063f2fde38b14610268576100bb565b80631ce19185146100c05780632242b40e1461010157806322d8a6e314610149578063715018a61461019d5780638da5cb5b146101a7575b600080fd5b6100dd600480360360208110156100d657600080fd5b503561028e565b604051808260038111156100ed57fe5b60ff16815260200191505060405180910390f35b6100dd600480360360c081101561011757600080fd5b50803590602081013590600160a060020a03604082013581169160608101359091169060808101359060a00135610413565b61018b600480360360a081101561015f57600080fd5b50803590600160a060020a03602082013581169160408101359091169060608101359060800135610931565b60408051918252519081900360200190f35b6101a5610993565b005b6101af6109fb565b60408051600160a060020a039092168252519081900360200190f35b6101d3610a0a565b604080519115158252519081900360200190f35b6101a5600480360360608110156101fd57600080fd5b50600160a060020a038135811691602081013582169160409091013516610a1b565b6101a56004803603602081101561023557600080fd5b5035600160a060020a0316610b7d565b61018b6004803603604081101561025b57600080fd5b5080359060200135610c7f565b6101a56004803603602081101561027e57600080fd5b5035600160a060020a0316610cc0565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b1580156102f357600080fd5b505afa158015610307573d6000803e3d6000fd5b505050506040513d602081101561031d57600080fd5b5051610373576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b1580156103e157600080fd5b505af11580156103f5573d6000803e3d6000fd5b505050506040513d602081101561040b57600080fd5b505192915050565b60008061042c886104278989898989610931565b610c7f565b606654604080517f2934a0ee0000000000000000000000000000000000000000000000000000000081526004810188905290519293506000928392600160a060020a031691632934a0ee9160248083019260e0929190829003018186803b15801561049657600080fd5b505afa1580156104aa573d6000803e3d6000fd5b505050506040513d60e08110156104c057600080fd5b8101908080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919080519060200190929190505050909192935090919250909150905050809250819350505060008a83308c6040516020018083600160a060020a0316600160a060020a03166c0100000000000000000000000002815260140182815260200192505050604051602081830303815290604052805190602001206040516020018084815260200183600160a060020a0316600160a060020a03166c010000000000000000000000000281526014018281526020019350505050604051602081830303815290604052805190602001209050868114610626576040805160e560020a62461bcd02815260206004820152601f60248201527f4c6f636b436f6e646974696f6e20494420646f6573206e6f74206d6174636800604482015290519081900360640190fd5b600282600381111561063457fe5b146106735760405160e560020a62461bcd028152600401808060200182810382526023815260200180610ffa6023913960400191505060405180910390fd5b606754604080517f70a0823100000000000000000000000000000000000000000000000000000000815230600482015290518c92600160a060020a0316916370a08231916024808301926020929190829003018186803b1580156106d657600080fd5b505afa1580156106ea573d6000803e3d6000fd5b505050506040513d602081101561070057600080fd5b50511015610758576040805160e560020a62461bcd02815260206004820152601260248201527f4e6f7420656e6f7567682062616c616e63650000000000000000000000000000604482015290519081900360640190fd5b606654604080517f336c5122000000000000000000000000000000000000000000000000000000008152600481018990529051600092600160a060020a03169163336c5122916024808301926020929190829003018186803b1580156107bd57600080fd5b505afa1580156107d1573d6000803e3d6000fd5b505050506040513d60208110156107e757600080fd5b50519050600060028260038111156107fb57fe5b141561081557508961080e86828e610cdd565b91506108d5565b600382600381111561082357fe5b141561083657508861080e86828e610cdd565b606654604080517f336c5122000000000000000000000000000000000000000000000000000000008152600481018990529051600160a060020a039092169163336c512291602480820192602092909190829003018186803b15801561089b57600080fd5b505afa1580156108af573d6000803e3d6000fd5b505050506040513d60208110156108c557600080fd5b5051965061092795505050505050565b80600160a060020a03168d7f30489630ef1e35cf4efeec045e3f1a7523e4eb5032d43970c86c5e375361aa30888f604051808381526020018281526020019250505060405180910390a3509450505050505b9695505050505050565b6040805160208082018890526c01000000000000000000000000600160a060020a0380891682028486015287160260548301526068820185905260888083018590528351808403909101815260a8909201909252805191012095945050505050565b61099b610a0a565b6109a457600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff1680610a345750610a34610e74565b80610a42575060005460ff16155b610a805760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610fcc602e913960400191505060405180910390fd5b600054610100900460ff16158015610aab576000805460ff1961ff0019909116610100171660011790555b600160a060020a03821615801590610acb5750600160a060020a03831615155b610b1f576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b610b2884610b7d565b60668054600160a060020a0380861673ffffffffffffffffffffffffffffffffffffffff199283161790925560678054928516929091169190911790558015610b77576000805461ff00191690555b50505050565b600054610100900460ff1680610b965750610b96610e74565b80610ba4575060005460ff16155b610be25760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610fcc602e913960400191505060405180910390fd5b600054610100900460ff16158015610c0d576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610c7b576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b610cc8610a0a565b610cd157600080fd5b610cda81610e7a565b50565b6000600160a060020a038316610d275760405160e560020a62461bcd028152600401808060200182810382526025815260200180610fa76025913960400191505060405180910390fd5b600160a060020a038316301415610d725760405160e560020a62461bcd02815260040180806020018281038252602b81526020018061101d602b913960400191505060405180910390fd5b606754604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a038681166004830152602482018690529151919092169163a9059cbb9160448083019260209291908290030181600087803b158015610de157600080fd5b505af1158015610df5573d6000803e3d6000fd5b505050506040513d6020811015610e0b57600080fd5b5051610e61576040805160e560020a62461bcd02815260206004820152601860248201527f436f756c64206e6f74207472616e7366657220746f6b656e0000000000000000604482015290519081900360640190fd5b610e6c846002610ef6565b949350505050565b303b1590565b600160a060020a038116610e8d57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e46918691869190602401826003811115610f4d57fe5b60ff16815260200192505050602060405180830381600087803b158015610f7357600080fd5b505af1158015610f87573d6000803e3d6000fd5b505050506040513d6020811015610f9d57600080fd5b5051939250505056fe4e756c6c206164647265737320697320696d706f737369626c6520746f2066756c66696c6c436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a65644c6f636b436f6e646974696f6e206e6565647320746f2062652046756c66696c6c6564457363726f7752657761726420636f6e74726163742063616e206e6f742062652061207265636569766572a165627a7a72305820f5123fe56469b6025217523c032220f8cd68626c6fabfc788345611a0f02f15f0029",
-  "address": "0xa182ff844c71803Bf767c3AB4180B3bfFADa6B2B",
-  "implementation": "0xF6851168F1Caf0218e096D5b63769230dd7ae60c",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/EscrowReward.mainnet.json b/artifacts/EscrowReward.mainnet.json
deleted file mode 100644
index 232bf69..0000000
--- a/artifacts/EscrowReward.mainnet.json
+++ /dev/null
@@ -1,266 +0,0 @@
-{
-  "name": "EscrowReward",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_receiver",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_conditionId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "Fulfilled",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_tokenAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc0c53b8b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_amount",
-          "type": "uint256"
-        },
-        {
-          "name": "_receiver",
-          "type": "address"
-        },
-        {
-          "name": "_sender",
-          "type": "address"
-        },
-        {
-          "name": "_lockCondition",
-          "type": "bytes32"
-        },
-        {
-          "name": "_releaseCondition",
-          "type": "bytes32"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0x22d8a6e3"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_amount",
-          "type": "uint256"
-        },
-        {
-          "name": "_receiver",
-          "type": "address"
-        },
-        {
-          "name": "_sender",
-          "type": "address"
-        },
-        {
-          "name": "_lockCondition",
-          "type": "bytes32"
-        },
-        {
-          "name": "_releaseCondition",
-          "type": "bytes32"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x2242b40e"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50611073806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c0100000000000000000000000000000000000000000000000000000000900480638f32d59b116100835780638f32d59b146101cb578063c0c53b8b146101e7578063c4d66de81461021f578063cb4e57e814610245578063f2fde38b14610268576100bb565b80631ce19185146100c05780632242b40e1461010157806322d8a6e314610149578063715018a61461019d5780638da5cb5b146101a7575b600080fd5b6100dd600480360360208110156100d657600080fd5b503561028e565b604051808260038111156100ed57fe5b60ff16815260200191505060405180910390f35b6100dd600480360360c081101561011757600080fd5b50803590602081013590600160a060020a03604082013581169160608101359091169060808101359060a00135610413565b61018b600480360360a081101561015f57600080fd5b50803590600160a060020a03602082013581169160408101359091169060608101359060800135610931565b60408051918252519081900360200190f35b6101a5610993565b005b6101af6109fb565b60408051600160a060020a039092168252519081900360200190f35b6101d3610a0a565b604080519115158252519081900360200190f35b6101a5600480360360608110156101fd57600080fd5b50600160a060020a038135811691602081013582169160409091013516610a1b565b6101a56004803603602081101561023557600080fd5b5035600160a060020a0316610b7d565b61018b6004803603604081101561025b57600080fd5b5080359060200135610c7f565b6101a56004803603602081101561027e57600080fd5b5035600160a060020a0316610cc0565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b1580156102f357600080fd5b505afa158015610307573d6000803e3d6000fd5b505050506040513d602081101561031d57600080fd5b5051610373576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b1580156103e157600080fd5b505af11580156103f5573d6000803e3d6000fd5b505050506040513d602081101561040b57600080fd5b505192915050565b60008061042c886104278989898989610931565b610c7f565b606654604080517f2934a0ee0000000000000000000000000000000000000000000000000000000081526004810188905290519293506000928392600160a060020a031691632934a0ee9160248083019260e0929190829003018186803b15801561049657600080fd5b505afa1580156104aa573d6000803e3d6000fd5b505050506040513d60e08110156104c057600080fd5b8101908080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919080519060200190929190505050909192935090919250909150905050809250819350505060008a83308c6040516020018083600160a060020a0316600160a060020a03166c0100000000000000000000000002815260140182815260200192505050604051602081830303815290604052805190602001206040516020018084815260200183600160a060020a0316600160a060020a03166c010000000000000000000000000281526014018281526020019350505050604051602081830303815290604052805190602001209050868114610626576040805160e560020a62461bcd02815260206004820152601f60248201527f4c6f636b436f6e646974696f6e20494420646f6573206e6f74206d6174636800604482015290519081900360640190fd5b600282600381111561063457fe5b146106735760405160e560020a62461bcd028152600401808060200182810382526023815260200180610ffa6023913960400191505060405180910390fd5b606754604080517f70a0823100000000000000000000000000000000000000000000000000000000815230600482015290518c92600160a060020a0316916370a08231916024808301926020929190829003018186803b1580156106d657600080fd5b505afa1580156106ea573d6000803e3d6000fd5b505050506040513d602081101561070057600080fd5b50511015610758576040805160e560020a62461bcd02815260206004820152601260248201527f4e6f7420656e6f7567682062616c616e63650000000000000000000000000000604482015290519081900360640190fd5b606654604080517f336c5122000000000000000000000000000000000000000000000000000000008152600481018990529051600092600160a060020a03169163336c5122916024808301926020929190829003018186803b1580156107bd57600080fd5b505afa1580156107d1573d6000803e3d6000fd5b505050506040513d60208110156107e757600080fd5b50519050600060028260038111156107fb57fe5b141561081557508961080e86828e610cdd565b91506108d5565b600382600381111561082357fe5b141561083657508861080e86828e610cdd565b606654604080517f336c5122000000000000000000000000000000000000000000000000000000008152600481018990529051600160a060020a039092169163336c512291602480820192602092909190829003018186803b15801561089b57600080fd5b505afa1580156108af573d6000803e3d6000fd5b505050506040513d60208110156108c557600080fd5b5051965061092795505050505050565b80600160a060020a03168d7f30489630ef1e35cf4efeec045e3f1a7523e4eb5032d43970c86c5e375361aa30888f604051808381526020018281526020019250505060405180910390a3509450505050505b9695505050505050565b6040805160208082018890526c01000000000000000000000000600160a060020a0380891682028486015287160260548301526068820185905260888083018590528351808403909101815260a8909201909252805191012095945050505050565b61099b610a0a565b6109a457600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff1680610a345750610a34610e74565b80610a42575060005460ff16155b610a805760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610fcc602e913960400191505060405180910390fd5b600054610100900460ff16158015610aab576000805460ff1961ff0019909116610100171660011790555b600160a060020a03821615801590610acb5750600160a060020a03831615155b610b1f576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b610b2884610b7d565b60668054600160a060020a0380861673ffffffffffffffffffffffffffffffffffffffff199283161790925560678054928516929091169190911790558015610b77576000805461ff00191690555b50505050565b600054610100900460ff1680610b965750610b96610e74565b80610ba4575060005460ff16155b610be25760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610fcc602e913960400191505060405180910390fd5b600054610100900460ff16158015610c0d576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610c7b576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b610cc8610a0a565b610cd157600080fd5b610cda81610e7a565b50565b6000600160a060020a038316610d275760405160e560020a62461bcd028152600401808060200182810382526025815260200180610fa76025913960400191505060405180910390fd5b600160a060020a038316301415610d725760405160e560020a62461bcd02815260040180806020018281038252602b81526020018061101d602b913960400191505060405180910390fd5b606754604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a038681166004830152602482018690529151919092169163a9059cbb9160448083019260209291908290030181600087803b158015610de157600080fd5b505af1158015610df5573d6000803e3d6000fd5b505050506040513d6020811015610e0b57600080fd5b5051610e61576040805160e560020a62461bcd02815260206004820152601860248201527f436f756c64206e6f74207472616e7366657220746f6b656e0000000000000000604482015290519081900360640190fd5b610e6c846002610ef6565b949350505050565b303b1590565b600160a060020a038116610e8d57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e46918691869190602401826003811115610f4d57fe5b60ff16815260200192505050602060405180830381600087803b158015610f7357600080fd5b505af1158015610f87573d6000803e3d6000fd5b505050506040513d6020811015610f9d57600080fd5b5051939250505056fe4e756c6c206164647265737320697320696d706f737369626c6520746f2066756c66696c6c436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a65644c6f636b436f6e646974696f6e206e6565647320746f2062652046756c66696c6c6564457363726f7752657761726420636f6e74726163742063616e206e6f742062652061207265636569766572a165627a7a72305820f5123fe56469b6025217523c032220f8cd68626c6fabfc788345611a0f02f15f0029",
-  "address": "0xB950FE753871dc8b79284d76EA4A213db4697578",
-  "implementation": "0xAf85B6DE10c8F84EFC4FaA30ffFbe77F08428634",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/EscrowReward.nile.json b/artifacts/EscrowReward.nile.json
deleted file mode 100644
index 27976a9..0000000
--- a/artifacts/EscrowReward.nile.json
+++ /dev/null
@@ -1,266 +0,0 @@
-{
-  "name": "EscrowReward",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_receiver",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_conditionId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "Fulfilled",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_tokenAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc0c53b8b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_amount",
-          "type": "uint256"
-        },
-        {
-          "name": "_receiver",
-          "type": "address"
-        },
-        {
-          "name": "_sender",
-          "type": "address"
-        },
-        {
-          "name": "_lockCondition",
-          "type": "bytes32"
-        },
-        {
-          "name": "_releaseCondition",
-          "type": "bytes32"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0x22d8a6e3"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_amount",
-          "type": "uint256"
-        },
-        {
-          "name": "_receiver",
-          "type": "address"
-        },
-        {
-          "name": "_sender",
-          "type": "address"
-        },
-        {
-          "name": "_lockCondition",
-          "type": "bytes32"
-        },
-        {
-          "name": "_releaseCondition",
-          "type": "bytes32"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x2242b40e"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50611073806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c0100000000000000000000000000000000000000000000000000000000900480638f32d59b116100835780638f32d59b146101cb578063c0c53b8b146101e7578063c4d66de81461021f578063cb4e57e814610245578063f2fde38b14610268576100bb565b80631ce19185146100c05780632242b40e1461010157806322d8a6e314610149578063715018a61461019d5780638da5cb5b146101a7575b600080fd5b6100dd600480360360208110156100d657600080fd5b503561028e565b604051808260038111156100ed57fe5b60ff16815260200191505060405180910390f35b6100dd600480360360c081101561011757600080fd5b50803590602081013590600160a060020a03604082013581169160608101359091169060808101359060a00135610413565b61018b600480360360a081101561015f57600080fd5b50803590600160a060020a03602082013581169160408101359091169060608101359060800135610931565b60408051918252519081900360200190f35b6101a5610993565b005b6101af6109fb565b60408051600160a060020a039092168252519081900360200190f35b6101d3610a0a565b604080519115158252519081900360200190f35b6101a5600480360360608110156101fd57600080fd5b50600160a060020a038135811691602081013582169160409091013516610a1b565b6101a56004803603602081101561023557600080fd5b5035600160a060020a0316610b7d565b61018b6004803603604081101561025b57600080fd5b5080359060200135610c7f565b6101a56004803603602081101561027e57600080fd5b5035600160a060020a0316610cc0565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b1580156102f357600080fd5b505afa158015610307573d6000803e3d6000fd5b505050506040513d602081101561031d57600080fd5b5051610373576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b1580156103e157600080fd5b505af11580156103f5573d6000803e3d6000fd5b505050506040513d602081101561040b57600080fd5b505192915050565b60008061042c886104278989898989610931565b610c7f565b606654604080517f2934a0ee0000000000000000000000000000000000000000000000000000000081526004810188905290519293506000928392600160a060020a031691632934a0ee9160248083019260e0929190829003018186803b15801561049657600080fd5b505afa1580156104aa573d6000803e3d6000fd5b505050506040513d60e08110156104c057600080fd5b8101908080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919080519060200190929190505050909192935090919250909150905050809250819350505060008a83308c6040516020018083600160a060020a0316600160a060020a03166c0100000000000000000000000002815260140182815260200192505050604051602081830303815290604052805190602001206040516020018084815260200183600160a060020a0316600160a060020a03166c010000000000000000000000000281526014018281526020019350505050604051602081830303815290604052805190602001209050868114610626576040805160e560020a62461bcd02815260206004820152601f60248201527f4c6f636b436f6e646974696f6e20494420646f6573206e6f74206d6174636800604482015290519081900360640190fd5b600282600381111561063457fe5b146106735760405160e560020a62461bcd028152600401808060200182810382526023815260200180610ffa6023913960400191505060405180910390fd5b606754604080517f70a0823100000000000000000000000000000000000000000000000000000000815230600482015290518c92600160a060020a0316916370a08231916024808301926020929190829003018186803b1580156106d657600080fd5b505afa1580156106ea573d6000803e3d6000fd5b505050506040513d602081101561070057600080fd5b50511015610758576040805160e560020a62461bcd02815260206004820152601260248201527f4e6f7420656e6f7567682062616c616e63650000000000000000000000000000604482015290519081900360640190fd5b606654604080517f336c5122000000000000000000000000000000000000000000000000000000008152600481018990529051600092600160a060020a03169163336c5122916024808301926020929190829003018186803b1580156107bd57600080fd5b505afa1580156107d1573d6000803e3d6000fd5b505050506040513d60208110156107e757600080fd5b50519050600060028260038111156107fb57fe5b141561081557508961080e86828e610cdd565b91506108d5565b600382600381111561082357fe5b141561083657508861080e86828e610cdd565b606654604080517f336c5122000000000000000000000000000000000000000000000000000000008152600481018990529051600160a060020a039092169163336c512291602480820192602092909190829003018186803b15801561089b57600080fd5b505afa1580156108af573d6000803e3d6000fd5b505050506040513d60208110156108c557600080fd5b5051965061092795505050505050565b80600160a060020a03168d7f30489630ef1e35cf4efeec045e3f1a7523e4eb5032d43970c86c5e375361aa30888f604051808381526020018281526020019250505060405180910390a3509450505050505b9695505050505050565b6040805160208082018890526c01000000000000000000000000600160a060020a0380891682028486015287160260548301526068820185905260888083018590528351808403909101815260a8909201909252805191012095945050505050565b61099b610a0a565b6109a457600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff1680610a345750610a34610e74565b80610a42575060005460ff16155b610a805760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610fcc602e913960400191505060405180910390fd5b600054610100900460ff16158015610aab576000805460ff1961ff0019909116610100171660011790555b600160a060020a03821615801590610acb5750600160a060020a03831615155b610b1f576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b610b2884610b7d565b60668054600160a060020a0380861673ffffffffffffffffffffffffffffffffffffffff199283161790925560678054928516929091169190911790558015610b77576000805461ff00191690555b50505050565b600054610100900460ff1680610b965750610b96610e74565b80610ba4575060005460ff16155b610be25760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610fcc602e913960400191505060405180910390fd5b600054610100900460ff16158015610c0d576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610c7b576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b610cc8610a0a565b610cd157600080fd5b610cda81610e7a565b50565b6000600160a060020a038316610d275760405160e560020a62461bcd028152600401808060200182810382526025815260200180610fa76025913960400191505060405180910390fd5b600160a060020a038316301415610d725760405160e560020a62461bcd02815260040180806020018281038252602b81526020018061101d602b913960400191505060405180910390fd5b606754604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a038681166004830152602482018690529151919092169163a9059cbb9160448083019260209291908290030181600087803b158015610de157600080fd5b505af1158015610df5573d6000803e3d6000fd5b505050506040513d6020811015610e0b57600080fd5b5051610e61576040805160e560020a62461bcd02815260206004820152601860248201527f436f756c64206e6f74207472616e7366657220746f6b656e0000000000000000604482015290519081900360640190fd5b610e6c846002610ef6565b949350505050565b303b1590565b600160a060020a038116610e8d57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e46918691869190602401826003811115610f4d57fe5b60ff16815260200192505050602060405180830381600087803b158015610f7357600080fd5b505af1158015610f87573d6000803e3d6000fd5b505050506040513d6020811015610f9d57600080fd5b5051939250505056fe4e756c6c206164647265737320697320696d706f737369626c6520746f2066756c66696c6c436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a65644c6f636b436f6e646974696f6e206e6565647320746f2062652046756c66696c6c6564457363726f7752657761726420636f6e74726163742063616e206e6f742062652061207265636569766572a165627a7a72305820f5123fe56469b6025217523c032220f8cd68626c6fabfc788345611a0f02f15f0029",
-  "address": "0xeD4Ef53376C6f103d2d7029D7E702e082767C6ff",
-  "implementation": "0xB5F0a1A91A5B9D3259a6a5D70Ef8507CD5576348",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/EscrowReward.pacific.json b/artifacts/EscrowReward.pacific.json
deleted file mode 100644
index 24108a6..0000000
--- a/artifacts/EscrowReward.pacific.json
+++ /dev/null
@@ -1,266 +0,0 @@
-{
-  "name": "EscrowReward",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_receiver",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_conditionId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "Fulfilled",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_tokenAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc0c53b8b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_amount",
-          "type": "uint256"
-        },
-        {
-          "name": "_receiver",
-          "type": "address"
-        },
-        {
-          "name": "_sender",
-          "type": "address"
-        },
-        {
-          "name": "_lockCondition",
-          "type": "bytes32"
-        },
-        {
-          "name": "_releaseCondition",
-          "type": "bytes32"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0x22d8a6e3"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_amount",
-          "type": "uint256"
-        },
-        {
-          "name": "_receiver",
-          "type": "address"
-        },
-        {
-          "name": "_sender",
-          "type": "address"
-        },
-        {
-          "name": "_lockCondition",
-          "type": "bytes32"
-        },
-        {
-          "name": "_releaseCondition",
-          "type": "bytes32"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x2242b40e"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50611073806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c0100000000000000000000000000000000000000000000000000000000900480638f32d59b116100835780638f32d59b146101cb578063c0c53b8b146101e7578063c4d66de81461021f578063cb4e57e814610245578063f2fde38b14610268576100bb565b80631ce19185146100c05780632242b40e1461010157806322d8a6e314610149578063715018a61461019d5780638da5cb5b146101a7575b600080fd5b6100dd600480360360208110156100d657600080fd5b503561028e565b604051808260038111156100ed57fe5b60ff16815260200191505060405180910390f35b6100dd600480360360c081101561011757600080fd5b50803590602081013590600160a060020a03604082013581169160608101359091169060808101359060a00135610413565b61018b600480360360a081101561015f57600080fd5b50803590600160a060020a03602082013581169160408101359091169060608101359060800135610931565b60408051918252519081900360200190f35b6101a5610993565b005b6101af6109fb565b60408051600160a060020a039092168252519081900360200190f35b6101d3610a0a565b604080519115158252519081900360200190f35b6101a5600480360360608110156101fd57600080fd5b50600160a060020a038135811691602081013582169160409091013516610a1b565b6101a56004803603602081101561023557600080fd5b5035600160a060020a0316610b7d565b61018b6004803603604081101561025b57600080fd5b5080359060200135610c7f565b6101a56004803603602081101561027e57600080fd5b5035600160a060020a0316610cc0565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b1580156102f357600080fd5b505afa158015610307573d6000803e3d6000fd5b505050506040513d602081101561031d57600080fd5b5051610373576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b1580156103e157600080fd5b505af11580156103f5573d6000803e3d6000fd5b505050506040513d602081101561040b57600080fd5b505192915050565b60008061042c886104278989898989610931565b610c7f565b606654604080517f2934a0ee0000000000000000000000000000000000000000000000000000000081526004810188905290519293506000928392600160a060020a031691632934a0ee9160248083019260e0929190829003018186803b15801561049657600080fd5b505afa1580156104aa573d6000803e3d6000fd5b505050506040513d60e08110156104c057600080fd5b8101908080519060200190929190805190602001909291908051906020019092919080519060200190929190805190602001909291908051906020019092919080519060200190929190505050909192935090919250909150905050809250819350505060008a83308c6040516020018083600160a060020a0316600160a060020a03166c0100000000000000000000000002815260140182815260200192505050604051602081830303815290604052805190602001206040516020018084815260200183600160a060020a0316600160a060020a03166c010000000000000000000000000281526014018281526020019350505050604051602081830303815290604052805190602001209050868114610626576040805160e560020a62461bcd02815260206004820152601f60248201527f4c6f636b436f6e646974696f6e20494420646f6573206e6f74206d6174636800604482015290519081900360640190fd5b600282600381111561063457fe5b146106735760405160e560020a62461bcd028152600401808060200182810382526023815260200180610ffa6023913960400191505060405180910390fd5b606754604080517f70a0823100000000000000000000000000000000000000000000000000000000815230600482015290518c92600160a060020a0316916370a08231916024808301926020929190829003018186803b1580156106d657600080fd5b505afa1580156106ea573d6000803e3d6000fd5b505050506040513d602081101561070057600080fd5b50511015610758576040805160e560020a62461bcd02815260206004820152601260248201527f4e6f7420656e6f7567682062616c616e63650000000000000000000000000000604482015290519081900360640190fd5b606654604080517f336c5122000000000000000000000000000000000000000000000000000000008152600481018990529051600092600160a060020a03169163336c5122916024808301926020929190829003018186803b1580156107bd57600080fd5b505afa1580156107d1573d6000803e3d6000fd5b505050506040513d60208110156107e757600080fd5b50519050600060028260038111156107fb57fe5b141561081557508961080e86828e610cdd565b91506108d5565b600382600381111561082357fe5b141561083657508861080e86828e610cdd565b606654604080517f336c5122000000000000000000000000000000000000000000000000000000008152600481018990529051600160a060020a039092169163336c512291602480820192602092909190829003018186803b15801561089b57600080fd5b505afa1580156108af573d6000803e3d6000fd5b505050506040513d60208110156108c557600080fd5b5051965061092795505050505050565b80600160a060020a03168d7f30489630ef1e35cf4efeec045e3f1a7523e4eb5032d43970c86c5e375361aa30888f604051808381526020018281526020019250505060405180910390a3509450505050505b9695505050505050565b6040805160208082018890526c01000000000000000000000000600160a060020a0380891682028486015287160260548301526068820185905260888083018590528351808403909101815260a8909201909252805191012095945050505050565b61099b610a0a565b6109a457600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff1680610a345750610a34610e74565b80610a42575060005460ff16155b610a805760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610fcc602e913960400191505060405180910390fd5b600054610100900460ff16158015610aab576000805460ff1961ff0019909116610100171660011790555b600160a060020a03821615801590610acb5750600160a060020a03831615155b610b1f576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b610b2884610b7d565b60668054600160a060020a0380861673ffffffffffffffffffffffffffffffffffffffff199283161790925560678054928516929091169190911790558015610b77576000805461ff00191690555b50505050565b600054610100900460ff1680610b965750610b96610e74565b80610ba4575060005460ff16155b610be25760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610fcc602e913960400191505060405180910390fd5b600054610100900460ff16158015610c0d576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610c7b576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b610cc8610a0a565b610cd157600080fd5b610cda81610e7a565b50565b6000600160a060020a038316610d275760405160e560020a62461bcd028152600401808060200182810382526025815260200180610fa76025913960400191505060405180910390fd5b600160a060020a038316301415610d725760405160e560020a62461bcd02815260040180806020018281038252602b81526020018061101d602b913960400191505060405180910390fd5b606754604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a038681166004830152602482018690529151919092169163a9059cbb9160448083019260209291908290030181600087803b158015610de157600080fd5b505af1158015610df5573d6000803e3d6000fd5b505050506040513d6020811015610e0b57600080fd5b5051610e61576040805160e560020a62461bcd02815260206004820152601860248201527f436f756c64206e6f74207472616e7366657220746f6b656e0000000000000000604482015290519081900360640190fd5b610e6c846002610ef6565b949350505050565b303b1590565b600160a060020a038116610e8d57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e46918691869190602401826003811115610f4d57fe5b60ff16815260200192505050602060405180830381600087803b158015610f7357600080fd5b505af1158015610f87573d6000803e3d6000fd5b505050506040513d6020811015610f9d57600080fd5b5051939250505056fe4e756c6c206164647265737320697320696d706f737369626c6520746f2066756c66696c6c436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a65644c6f636b436f6e646974696f6e206e6565647320746f2062652046756c66696c6c6564457363726f7752657761726420636f6e74726163742063616e206e6f742062652061207265636569766572a165627a7a72305820f5123fe56469b6025217523c032220f8cd68626c6fabfc788345611a0f02f15f0029",
-  "address": "0x656Aa3D9b37A6eA770701ae2c612f760d9254A66",
-  "implementation": "0x24D9D62a4fBF46766e41c43CF3fCFB9429E91Bef",
-  "version": "v0.10.3"
-}
\ No newline at end of file
diff --git a/artifacts/HashLockCondition.duero.json b/artifacts/HashLockCondition.duero.json
deleted file mode 100644
index 1a4d01f..0000000
--- a/artifacts/HashLockCondition.duero.json
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "name": "HashLockCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x485cc955"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_preimage",
-          "type": "bytes32"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0x80d16806"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_preimage",
-          "type": "uint256"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xb613eb5c"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_preimage",
-          "type": "string"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xd0ac9b09"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_preimage",
-          "type": "bytes32"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x042f2b65"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_preimage",
-          "type": "string"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x37441996"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_preimage",
-          "type": "uint256"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4357855e"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610aeb806100206000396000f3fe608060405234801561001057600080fd5b5060043610610107576000357c0100000000000000000000000000000000000000000000000000000000900480638da5cb5b116100a9578063c4d66de811610083578063c4d66de8146102c4578063cb4e57e8146102ea578063d0ac9b091461030d578063f2fde38b146103b357610107565b80638da5cb5b146102845780638f32d59b146102a8578063b613eb5c1461025557610107565b80634357855e116100e55780634357855e1461010c578063485cc9551461021d578063715018a61461024d57806380d168061461025557610107565b8063042f2b651461010c5780631ce19185146101535780633744199614610170575b600080fd5b61012f6004803603604081101561012257600080fd5b50803590602001356103d9565b6040518082600381111561013f57fe5b60ff16815260200191505060405180910390f35b61012f6004803603602081101561016957600080fd5b50356103fc565b61012f6004803603604081101561018657600080fd5b813591908101906040810160208201356401000000008111156101a857600080fd5b8201836020820111156101ba57600080fd5b803590602001918460018302840111640100000000831117156101dc57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610581945050505050565b61024b6004803603604081101561023357600080fd5b50600160a060020a0381358116916020013516610593565b005b61024b6106c9565b6102726004803603602081101561026b57600080fd5b5035610731565b60408051918252519081900360200190f35b61028c610755565b60408051600160a060020a039092168252519081900360200190f35b6102b0610764565b604080519115158252519081900360200190f35b61024b600480360360208110156102da57600080fd5b5035600160a060020a0316610775565b6102726004803603604081101561030057600080fd5b5080359060200135610877565b6102726004803603602081101561032357600080fd5b81019060208101813564010000000081111561033e57600080fd5b82018360208201111561035057600080fd5b8035906020019184600183028401116401000000008311171561037257600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295506108b8945050505050565b61024b600480360360208110156103c957600080fd5b5035600160a060020a031661092f565b60006103f56103f0846103eb85610731565b610877565b61094c565b9392505050565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b15801561046157600080fd5b505afa158015610475573d6000803e3d6000fd5b505050506040513d602081101561048b57600080fd5b50516104e1576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b15801561054f57600080fd5b505af1158015610563573d6000803e3d6000fd5b505050506040513d602081101561057957600080fd5b505192915050565b60006103f56103f0846103eb856108b8565b600054610100900460ff16806105ac57506105ac61095f565b806105ba575060005460ff16155b6105f85760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a92602e913960400191505060405180910390fd5b600054610100900460ff16158015610623576000805460ff1961ff0019909116610100171660011790555b600160a060020a038216610681576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b61068a83610775565b6066805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03841617905580156106c4576000805461ff00191690555b505050565b6106d1610764565b6106da57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b60408051602080820193909352815180820384018152908201909152805191012090565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff168061078e575061078e61095f565b8061079c575060005460ff16155b6107da5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a92602e913960400191505060405180910390fd5b600054610100900460ff16158015610805576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610873576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b6000816040516020018082805190602001908083835b602083106108ed5780518252601f1990920191602091820191016108ce565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051602081830303815290604052805190602001209050919050565b610937610764565b61094057600080fd5b61094981610965565b50565b60006109598260026109e1565b92915050565b303b1590565b600160a060020a03811661097857600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e46918691869190602401826003811115610a3857fe5b60ff16815260200192505050602060405180830381600087803b158015610a5e57600080fd5b505af1158015610a72573d6000803e3d6000fd5b505050506040513d6020811015610a8857600080fd5b5051939250505056fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820838119c870ddf0ef3e7e699bc64c46127fb7e20e46a74501a294cfe56a1461c50029",
-  "address": "0xA2Ab4153F9df4Cccb859d54Aea7A47298Bc83DF6",
-  "implementation": "0x2dB2cec56A7FF5F330ee4c845C06043e1ff71c7F",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/HashLockCondition.kovan.json b/artifacts/HashLockCondition.kovan.json
deleted file mode 100644
index ef41ac5..0000000
--- a/artifacts/HashLockCondition.kovan.json
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "name": "HashLockCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x485cc955"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_preimage",
-          "type": "bytes32"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0x80d16806"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_preimage",
-          "type": "uint256"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xb613eb5c"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_preimage",
-          "type": "string"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xd0ac9b09"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_preimage",
-          "type": "bytes32"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x042f2b65"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_preimage",
-          "type": "string"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x37441996"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_preimage",
-          "type": "uint256"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4357855e"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610aeb806100206000396000f3fe608060405234801561001057600080fd5b5060043610610107576000357c0100000000000000000000000000000000000000000000000000000000900480638da5cb5b116100a9578063c4d66de811610083578063c4d66de8146102c4578063cb4e57e8146102ea578063d0ac9b091461030d578063f2fde38b146103b357610107565b80638da5cb5b146102845780638f32d59b146102a8578063b613eb5c1461025557610107565b80634357855e116100e55780634357855e1461010c578063485cc9551461021d578063715018a61461024d57806380d168061461025557610107565b8063042f2b651461010c5780631ce19185146101535780633744199614610170575b600080fd5b61012f6004803603604081101561012257600080fd5b50803590602001356103d9565b6040518082600381111561013f57fe5b60ff16815260200191505060405180910390f35b61012f6004803603602081101561016957600080fd5b50356103fc565b61012f6004803603604081101561018657600080fd5b813591908101906040810160208201356401000000008111156101a857600080fd5b8201836020820111156101ba57600080fd5b803590602001918460018302840111640100000000831117156101dc57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610581945050505050565b61024b6004803603604081101561023357600080fd5b50600160a060020a0381358116916020013516610593565b005b61024b6106c9565b6102726004803603602081101561026b57600080fd5b5035610731565b60408051918252519081900360200190f35b61028c610755565b60408051600160a060020a039092168252519081900360200190f35b6102b0610764565b604080519115158252519081900360200190f35b61024b600480360360208110156102da57600080fd5b5035600160a060020a0316610775565b6102726004803603604081101561030057600080fd5b5080359060200135610877565b6102726004803603602081101561032357600080fd5b81019060208101813564010000000081111561033e57600080fd5b82018360208201111561035057600080fd5b8035906020019184600183028401116401000000008311171561037257600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295506108b8945050505050565b61024b600480360360208110156103c957600080fd5b5035600160a060020a031661092f565b60006103f56103f0846103eb85610731565b610877565b61094c565b9392505050565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b15801561046157600080fd5b505afa158015610475573d6000803e3d6000fd5b505050506040513d602081101561048b57600080fd5b50516104e1576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b15801561054f57600080fd5b505af1158015610563573d6000803e3d6000fd5b505050506040513d602081101561057957600080fd5b505192915050565b60006103f56103f0846103eb856108b8565b600054610100900460ff16806105ac57506105ac61095f565b806105ba575060005460ff16155b6105f85760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a92602e913960400191505060405180910390fd5b600054610100900460ff16158015610623576000805460ff1961ff0019909116610100171660011790555b600160a060020a038216610681576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b61068a83610775565b6066805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03841617905580156106c4576000805461ff00191690555b505050565b6106d1610764565b6106da57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b60408051602080820193909352815180820384018152908201909152805191012090565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff168061078e575061078e61095f565b8061079c575060005460ff16155b6107da5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a92602e913960400191505060405180910390fd5b600054610100900460ff16158015610805576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610873576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b6000816040516020018082805190602001908083835b602083106108ed5780518252601f1990920191602091820191016108ce565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051602081830303815290604052805190602001209050919050565b610937610764565b61094057600080fd5b61094981610965565b50565b60006109598260026109e1565b92915050565b303b1590565b600160a060020a03811661097857600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e46918691869190602401826003811115610a3857fe5b60ff16815260200192505050602060405180830381600087803b158015610a5e57600080fd5b505af1158015610a72573d6000803e3d6000fd5b505050506040513d6020811015610a8857600080fd5b5051939250505056fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820838119c870ddf0ef3e7e699bc64c46127fb7e20e46a74501a294cfe56a1461c50029",
-  "address": "0x11ef2D50868c1f1063ba0141aCD53691A0293c25",
-  "implementation": "0xF5B0E534168f0a033423b96D64fE37ba6534A7Ff",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/HashLockCondition.mainnet.json b/artifacts/HashLockCondition.mainnet.json
deleted file mode 100644
index 3b10f4f..0000000
--- a/artifacts/HashLockCondition.mainnet.json
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "name": "HashLockCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x485cc955"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_preimage",
-          "type": "bytes32"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0x80d16806"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_preimage",
-          "type": "uint256"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xb613eb5c"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_preimage",
-          "type": "string"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xd0ac9b09"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_preimage",
-          "type": "bytes32"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x042f2b65"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_preimage",
-          "type": "string"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x37441996"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_preimage",
-          "type": "uint256"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4357855e"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610aeb806100206000396000f3fe608060405234801561001057600080fd5b5060043610610107576000357c0100000000000000000000000000000000000000000000000000000000900480638da5cb5b116100a9578063c4d66de811610083578063c4d66de8146102c4578063cb4e57e8146102ea578063d0ac9b091461030d578063f2fde38b146103b357610107565b80638da5cb5b146102845780638f32d59b146102a8578063b613eb5c1461025557610107565b80634357855e116100e55780634357855e1461010c578063485cc9551461021d578063715018a61461024d57806380d168061461025557610107565b8063042f2b651461010c5780631ce19185146101535780633744199614610170575b600080fd5b61012f6004803603604081101561012257600080fd5b50803590602001356103d9565b6040518082600381111561013f57fe5b60ff16815260200191505060405180910390f35b61012f6004803603602081101561016957600080fd5b50356103fc565b61012f6004803603604081101561018657600080fd5b813591908101906040810160208201356401000000008111156101a857600080fd5b8201836020820111156101ba57600080fd5b803590602001918460018302840111640100000000831117156101dc57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610581945050505050565b61024b6004803603604081101561023357600080fd5b50600160a060020a0381358116916020013516610593565b005b61024b6106c9565b6102726004803603602081101561026b57600080fd5b5035610731565b60408051918252519081900360200190f35b61028c610755565b60408051600160a060020a039092168252519081900360200190f35b6102b0610764565b604080519115158252519081900360200190f35b61024b600480360360208110156102da57600080fd5b5035600160a060020a0316610775565b6102726004803603604081101561030057600080fd5b5080359060200135610877565b6102726004803603602081101561032357600080fd5b81019060208101813564010000000081111561033e57600080fd5b82018360208201111561035057600080fd5b8035906020019184600183028401116401000000008311171561037257600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295506108b8945050505050565b61024b600480360360208110156103c957600080fd5b5035600160a060020a031661092f565b60006103f56103f0846103eb85610731565b610877565b61094c565b9392505050565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b15801561046157600080fd5b505afa158015610475573d6000803e3d6000fd5b505050506040513d602081101561048b57600080fd5b50516104e1576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b15801561054f57600080fd5b505af1158015610563573d6000803e3d6000fd5b505050506040513d602081101561057957600080fd5b505192915050565b60006103f56103f0846103eb856108b8565b600054610100900460ff16806105ac57506105ac61095f565b806105ba575060005460ff16155b6105f85760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a92602e913960400191505060405180910390fd5b600054610100900460ff16158015610623576000805460ff1961ff0019909116610100171660011790555b600160a060020a038216610681576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b61068a83610775565b6066805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03841617905580156106c4576000805461ff00191690555b505050565b6106d1610764565b6106da57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b60408051602080820193909352815180820384018152908201909152805191012090565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff168061078e575061078e61095f565b8061079c575060005460ff16155b6107da5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a92602e913960400191505060405180910390fd5b600054610100900460ff16158015610805576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610873576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b6000816040516020018082805190602001908083835b602083106108ed5780518252601f1990920191602091820191016108ce565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051602081830303815290604052805190602001209050919050565b610937610764565b61094057600080fd5b61094981610965565b50565b60006109598260026109e1565b92915050565b303b1590565b600160a060020a03811661097857600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e46918691869190602401826003811115610a3857fe5b60ff16815260200192505050602060405180830381600087803b158015610a5e57600080fd5b505af1158015610a72573d6000803e3d6000fd5b505050506040513d6020811015610a8857600080fd5b5051939250505056fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820838119c870ddf0ef3e7e699bc64c46127fb7e20e46a74501a294cfe56a1461c50029",
-  "address": "0x860761Dbbe9b8377A2933a1093B39167B907befF",
-  "implementation": "0xb86e75fB53DAE6846b322B7A914EB7305Ab13bdE",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/HashLockCondition.nile.json b/artifacts/HashLockCondition.nile.json
deleted file mode 100644
index c9343f9..0000000
--- a/artifacts/HashLockCondition.nile.json
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "name": "HashLockCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x485cc955"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_preimage",
-          "type": "bytes32"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0x80d16806"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_preimage",
-          "type": "uint256"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xb613eb5c"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_preimage",
-          "type": "string"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xd0ac9b09"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_preimage",
-          "type": "bytes32"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x042f2b65"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_preimage",
-          "type": "string"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x37441996"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_preimage",
-          "type": "uint256"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4357855e"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610aeb806100206000396000f3fe608060405234801561001057600080fd5b5060043610610107576000357c0100000000000000000000000000000000000000000000000000000000900480638da5cb5b116100a9578063c4d66de811610083578063c4d66de8146102c4578063cb4e57e8146102ea578063d0ac9b091461030d578063f2fde38b146103b357610107565b80638da5cb5b146102845780638f32d59b146102a8578063b613eb5c1461025557610107565b80634357855e116100e55780634357855e1461010c578063485cc9551461021d578063715018a61461024d57806380d168061461025557610107565b8063042f2b651461010c5780631ce19185146101535780633744199614610170575b600080fd5b61012f6004803603604081101561012257600080fd5b50803590602001356103d9565b6040518082600381111561013f57fe5b60ff16815260200191505060405180910390f35b61012f6004803603602081101561016957600080fd5b50356103fc565b61012f6004803603604081101561018657600080fd5b813591908101906040810160208201356401000000008111156101a857600080fd5b8201836020820111156101ba57600080fd5b803590602001918460018302840111640100000000831117156101dc57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610581945050505050565b61024b6004803603604081101561023357600080fd5b50600160a060020a0381358116916020013516610593565b005b61024b6106c9565b6102726004803603602081101561026b57600080fd5b5035610731565b60408051918252519081900360200190f35b61028c610755565b60408051600160a060020a039092168252519081900360200190f35b6102b0610764565b604080519115158252519081900360200190f35b61024b600480360360208110156102da57600080fd5b5035600160a060020a0316610775565b6102726004803603604081101561030057600080fd5b5080359060200135610877565b6102726004803603602081101561032357600080fd5b81019060208101813564010000000081111561033e57600080fd5b82018360208201111561035057600080fd5b8035906020019184600183028401116401000000008311171561037257600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295506108b8945050505050565b61024b600480360360208110156103c957600080fd5b5035600160a060020a031661092f565b60006103f56103f0846103eb85610731565b610877565b61094c565b9392505050565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b15801561046157600080fd5b505afa158015610475573d6000803e3d6000fd5b505050506040513d602081101561048b57600080fd5b50516104e1576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b15801561054f57600080fd5b505af1158015610563573d6000803e3d6000fd5b505050506040513d602081101561057957600080fd5b505192915050565b60006103f56103f0846103eb856108b8565b600054610100900460ff16806105ac57506105ac61095f565b806105ba575060005460ff16155b6105f85760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a92602e913960400191505060405180910390fd5b600054610100900460ff16158015610623576000805460ff1961ff0019909116610100171660011790555b600160a060020a038216610681576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b61068a83610775565b6066805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03841617905580156106c4576000805461ff00191690555b505050565b6106d1610764565b6106da57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b60408051602080820193909352815180820384018152908201909152805191012090565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff168061078e575061078e61095f565b8061079c575060005460ff16155b6107da5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a92602e913960400191505060405180910390fd5b600054610100900460ff16158015610805576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610873576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b6000816040516020018082805190602001908083835b602083106108ed5780518252601f1990920191602091820191016108ce565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051602081830303815290604052805190602001209050919050565b610937610764565b61094057600080fd5b61094981610965565b50565b60006109598260026109e1565b92915050565b303b1590565b600160a060020a03811661097857600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e46918691869190602401826003811115610a3857fe5b60ff16815260200192505050602060405180830381600087803b158015610a5e57600080fd5b505af1158015610a72573d6000803e3d6000fd5b505050506040513d6020811015610a8857600080fd5b5051939250505056fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820838119c870ddf0ef3e7e699bc64c46127fb7e20e46a74501a294cfe56a1461c50029",
-  "address": "0xB5f2e45e8aD4a1339D542f2defd5095B98054590",
-  "implementation": "0x27B750C1CE3ba53962aa1Ca6e053E5C23F5075cd",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/HashLockCondition.pacific.json b/artifacts/HashLockCondition.pacific.json
deleted file mode 100644
index 9b91f78..0000000
--- a/artifacts/HashLockCondition.pacific.json
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "name": "HashLockCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x485cc955"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_preimage",
-          "type": "bytes32"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0x80d16806"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_preimage",
-          "type": "uint256"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xb613eb5c"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_preimage",
-          "type": "string"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xd0ac9b09"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_preimage",
-          "type": "bytes32"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x042f2b65"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_preimage",
-          "type": "string"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x37441996"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_preimage",
-          "type": "uint256"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x4357855e"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610aeb806100206000396000f3fe608060405234801561001057600080fd5b5060043610610107576000357c0100000000000000000000000000000000000000000000000000000000900480638da5cb5b116100a9578063c4d66de811610083578063c4d66de8146102c4578063cb4e57e8146102ea578063d0ac9b091461030d578063f2fde38b146103b357610107565b80638da5cb5b146102845780638f32d59b146102a8578063b613eb5c1461025557610107565b80634357855e116100e55780634357855e1461010c578063485cc9551461021d578063715018a61461024d57806380d168061461025557610107565b8063042f2b651461010c5780631ce19185146101535780633744199614610170575b600080fd5b61012f6004803603604081101561012257600080fd5b50803590602001356103d9565b6040518082600381111561013f57fe5b60ff16815260200191505060405180910390f35b61012f6004803603602081101561016957600080fd5b50356103fc565b61012f6004803603604081101561018657600080fd5b813591908101906040810160208201356401000000008111156101a857600080fd5b8201836020820111156101ba57600080fd5b803590602001918460018302840111640100000000831117156101dc57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610581945050505050565b61024b6004803603604081101561023357600080fd5b50600160a060020a0381358116916020013516610593565b005b61024b6106c9565b6102726004803603602081101561026b57600080fd5b5035610731565b60408051918252519081900360200190f35b61028c610755565b60408051600160a060020a039092168252519081900360200190f35b6102b0610764565b604080519115158252519081900360200190f35b61024b600480360360208110156102da57600080fd5b5035600160a060020a0316610775565b6102726004803603604081101561030057600080fd5b5080359060200135610877565b6102726004803603602081101561032357600080fd5b81019060208101813564010000000081111561033e57600080fd5b82018360208201111561035057600080fd5b8035906020019184600183028401116401000000008311171561037257600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295506108b8945050505050565b61024b600480360360208110156103c957600080fd5b5035600160a060020a031661092f565b60006103f56103f0846103eb85610731565b610877565b61094c565b9392505050565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b15801561046157600080fd5b505afa158015610475573d6000803e3d6000fd5b505050506040513d602081101561048b57600080fd5b50516104e1576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b15801561054f57600080fd5b505af1158015610563573d6000803e3d6000fd5b505050506040513d602081101561057957600080fd5b505192915050565b60006103f56103f0846103eb856108b8565b600054610100900460ff16806105ac57506105ac61095f565b806105ba575060005460ff16155b6105f85760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a92602e913960400191505060405180910390fd5b600054610100900460ff16158015610623576000805460ff1961ff0019909116610100171660011790555b600160a060020a038216610681576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b61068a83610775565b6066805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03841617905580156106c4576000805461ff00191690555b505050565b6106d1610764565b6106da57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b60408051602080820193909352815180820384018152908201909152805191012090565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff168061078e575061078e61095f565b8061079c575060005460ff16155b6107da5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a92602e913960400191505060405180910390fd5b600054610100900460ff16158015610805576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610873576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b6000816040516020018082805190602001908083835b602083106108ed5780518252601f1990920191602091820191016108ce565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051602081830303815290604052805190602001209050919050565b610937610764565b61094057600080fd5b61094981610965565b50565b60006109598260026109e1565b92915050565b303b1590565b600160a060020a03811661097857600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e46918691869190602401826003811115610a3857fe5b60ff16815260200192505050602060405180830381600087803b158015610a5e57600080fd5b505af1158015610a72573d6000803e3d6000fd5b505050506040513d6020811015610a8857600080fd5b5051939250505056fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820838119c870ddf0ef3e7e699bc64c46127fb7e20e46a74501a294cfe56a1461c50029",
-  "address": "0x5Eef92d570996ED20Cb60fE41475f594299Ec21C",
-  "implementation": "0x47816ECB7F539d4b5FBD77277ff30EfedcE8e984",
-  "version": "v0.10.3"
-}
\ No newline at end of file
diff --git a/artifacts/LockRewardCondition.duero.json b/artifacts/LockRewardCondition.duero.json
deleted file mode 100644
index 2950549..0000000
--- a/artifacts/LockRewardCondition.duero.json
+++ /dev/null
@@ -1,242 +0,0 @@
-{
-  "name": "LockRewardCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_rewardAddress",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_conditionId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "Fulfilled",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_tokenAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc0c53b8b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_rewardAddress",
-          "type": "address"
-        },
-        {
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0x118f6402"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_rewardAddress",
-          "type": "address"
-        },
-        {
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x2a29ece6"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610a74806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c0100000000000000000000000000000000000000000000000000000000900480638f32d59b116100835780638f32d59b1461019f578063c0c53b8b146101bb578063c4d66de8146101f3578063cb4e57e814610219578063f2fde38b1461023c576100bb565b8063118f6402146100c05780631ce19185146100fe5780632a29ece61461013f578063715018a6146101715780638da5cb5b1461017b575b600080fd5b6100ec600480360360408110156100d657600080fd5b50600160a060020a038135169060200135610262565b60408051918252519081900360200190f35b61011b6004803603602081101561011457600080fd5b50356102ac565b6040518082600381111561012b57fe5b60ff16815260200191505060405180910390f35b61011b6004803603606081101561015557600080fd5b50803590600160a060020a036020820135169060400135610431565b61017961059e565b005b610183610606565b60408051600160a060020a039092168252519081900360200190f35b6101a7610615565b604080519115158252519081900360200190f35b610179600480360360608110156101d157600080fd5b50600160a060020a038135811691602081013582169160409091013516610626565b6101796004803603602081101561020957600080fd5b5035600160a060020a0316610788565b6100ec6004803603604081101561022f57600080fd5b508035906020013561088a565b6101796004803603602081101561025257600080fd5b5035600160a060020a03166108cb565b60408051600160a060020a03939093166c01000000000000000000000000026020808501919091526034808501939093528151808503909301835260549093019052805191012090565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b15801561031157600080fd5b505afa158015610325573d6000803e3d6000fd5b505050506040513d602081101561033b57600080fd5b5051610391576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b1580156103ff57600080fd5b505af1158015610413573d6000803e3d6000fd5b505050506040513d602081101561042957600080fd5b505192915050565b606754604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152600160a060020a03858116602483015260448201859052915160009392909216916323b872dd9160648082019260209290919082900301818787803b1580156104a957600080fd5b505af11580156104bd573d6000803e3d6000fd5b505050506040513d60208110156104d357600080fd5b5051610529576040805160e560020a62461bcd02815260206004820152601860248201527f436f756c64206e6f74207472616e7366657220746f6b656e0000000000000000604482015290519081900360640190fd5b600061053e856105398686610262565b61088a565b9050600061054d8260026108e8565b60408051848152602081018790528151929350600160a060020a0388169289927f30489630ef1e35cf4efeec045e3f1a7523e4eb5032d43970c86c5e375361aa30928290030190a395945050505050565b6105a6610615565b6105af57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff168061063f575061063f610998565b8061064d575060005460ff16155b61068b5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff161580156106b6576000805460ff1961ff0019909116610100171660011790555b600160a060020a038216158015906106d65750600160a060020a03831615155b61072a576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b61073384610788565b60668054600160a060020a0380861673ffffffffffffffffffffffffffffffffffffffff199283161790925560678054928516929091169190911790558015610782576000805461ff00191690555b50505050565b600054610100900460ff16806107a157506107a1610998565b806107af575060005460ff16155b6107ed5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff16158015610818576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610886576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b6108d3610615565b6108dc57600080fd5b6108e58161099e565b50565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e4691869186919060240182600381111561093f57fe5b60ff16815260200192505050602060405180830381600087803b15801561096557600080fd5b505af1158015610979573d6000803e3d6000fd5b505050506040513d602081101561098f57600080fd5b50519392505050565b303b1590565b600160a060020a0381166109b157600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820c8df4fc4f5e872036d3745f0160b54c6e23f5fc8ce922ac592293b1db64dfcdf0029",
-  "address": "0x518cf43258Ece569D5Cd19e6C0Cee41156FB6aED",
-  "implementation": "0xB83B7eC51160715783Dd267275c18C37AfC4F0a0",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/LockRewardCondition.kovan.json b/artifacts/LockRewardCondition.kovan.json
deleted file mode 100644
index e24b5f1..0000000
--- a/artifacts/LockRewardCondition.kovan.json
+++ /dev/null
@@ -1,242 +0,0 @@
-{
-  "name": "LockRewardCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_rewardAddress",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_conditionId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "Fulfilled",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_tokenAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc0c53b8b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_rewardAddress",
-          "type": "address"
-        },
-        {
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0x118f6402"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_rewardAddress",
-          "type": "address"
-        },
-        {
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x2a29ece6"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610a74806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c0100000000000000000000000000000000000000000000000000000000900480638f32d59b116100835780638f32d59b1461019f578063c0c53b8b146101bb578063c4d66de8146101f3578063cb4e57e814610219578063f2fde38b1461023c576100bb565b8063118f6402146100c05780631ce19185146100fe5780632a29ece61461013f578063715018a6146101715780638da5cb5b1461017b575b600080fd5b6100ec600480360360408110156100d657600080fd5b50600160a060020a038135169060200135610262565b60408051918252519081900360200190f35b61011b6004803603602081101561011457600080fd5b50356102ac565b6040518082600381111561012b57fe5b60ff16815260200191505060405180910390f35b61011b6004803603606081101561015557600080fd5b50803590600160a060020a036020820135169060400135610431565b61017961059e565b005b610183610606565b60408051600160a060020a039092168252519081900360200190f35b6101a7610615565b604080519115158252519081900360200190f35b610179600480360360608110156101d157600080fd5b50600160a060020a038135811691602081013582169160409091013516610626565b6101796004803603602081101561020957600080fd5b5035600160a060020a0316610788565b6100ec6004803603604081101561022f57600080fd5b508035906020013561088a565b6101796004803603602081101561025257600080fd5b5035600160a060020a03166108cb565b60408051600160a060020a03939093166c01000000000000000000000000026020808501919091526034808501939093528151808503909301835260549093019052805191012090565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b15801561031157600080fd5b505afa158015610325573d6000803e3d6000fd5b505050506040513d602081101561033b57600080fd5b5051610391576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b1580156103ff57600080fd5b505af1158015610413573d6000803e3d6000fd5b505050506040513d602081101561042957600080fd5b505192915050565b606754604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152600160a060020a03858116602483015260448201859052915160009392909216916323b872dd9160648082019260209290919082900301818787803b1580156104a957600080fd5b505af11580156104bd573d6000803e3d6000fd5b505050506040513d60208110156104d357600080fd5b5051610529576040805160e560020a62461bcd02815260206004820152601860248201527f436f756c64206e6f74207472616e7366657220746f6b656e0000000000000000604482015290519081900360640190fd5b600061053e856105398686610262565b61088a565b9050600061054d8260026108e8565b60408051848152602081018790528151929350600160a060020a0388169289927f30489630ef1e35cf4efeec045e3f1a7523e4eb5032d43970c86c5e375361aa30928290030190a395945050505050565b6105a6610615565b6105af57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff168061063f575061063f610998565b8061064d575060005460ff16155b61068b5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff161580156106b6576000805460ff1961ff0019909116610100171660011790555b600160a060020a038216158015906106d65750600160a060020a03831615155b61072a576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b61073384610788565b60668054600160a060020a0380861673ffffffffffffffffffffffffffffffffffffffff199283161790925560678054928516929091169190911790558015610782576000805461ff00191690555b50505050565b600054610100900460ff16806107a157506107a1610998565b806107af575060005460ff16155b6107ed5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff16158015610818576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610886576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b6108d3610615565b6108dc57600080fd5b6108e58161099e565b50565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e4691869186919060240182600381111561093f57fe5b60ff16815260200192505050602060405180830381600087803b15801561096557600080fd5b505af1158015610979573d6000803e3d6000fd5b505050506040513d602081101561098f57600080fd5b50519392505050565b303b1590565b600160a060020a0381166109b157600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820c8df4fc4f5e872036d3745f0160b54c6e23f5fc8ce922ac592293b1db64dfcdf0029",
-  "address": "0x2a2A2C5fF51C5f1c84547FC7a194c00F82763432",
-  "implementation": "0x0283293F747BEf99Dadde5977392f05Ca528094e",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/LockRewardCondition.mainnet.json b/artifacts/LockRewardCondition.mainnet.json
deleted file mode 100644
index 42ff5ae..0000000
--- a/artifacts/LockRewardCondition.mainnet.json
+++ /dev/null
@@ -1,242 +0,0 @@
-{
-  "name": "LockRewardCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_rewardAddress",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_conditionId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "Fulfilled",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_tokenAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc0c53b8b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_rewardAddress",
-          "type": "address"
-        },
-        {
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0x118f6402"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_rewardAddress",
-          "type": "address"
-        },
-        {
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x2a29ece6"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610a74806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c0100000000000000000000000000000000000000000000000000000000900480638f32d59b116100835780638f32d59b1461019f578063c0c53b8b146101bb578063c4d66de8146101f3578063cb4e57e814610219578063f2fde38b1461023c576100bb565b8063118f6402146100c05780631ce19185146100fe5780632a29ece61461013f578063715018a6146101715780638da5cb5b1461017b575b600080fd5b6100ec600480360360408110156100d657600080fd5b50600160a060020a038135169060200135610262565b60408051918252519081900360200190f35b61011b6004803603602081101561011457600080fd5b50356102ac565b6040518082600381111561012b57fe5b60ff16815260200191505060405180910390f35b61011b6004803603606081101561015557600080fd5b50803590600160a060020a036020820135169060400135610431565b61017961059e565b005b610183610606565b60408051600160a060020a039092168252519081900360200190f35b6101a7610615565b604080519115158252519081900360200190f35b610179600480360360608110156101d157600080fd5b50600160a060020a038135811691602081013582169160409091013516610626565b6101796004803603602081101561020957600080fd5b5035600160a060020a0316610788565b6100ec6004803603604081101561022f57600080fd5b508035906020013561088a565b6101796004803603602081101561025257600080fd5b5035600160a060020a03166108cb565b60408051600160a060020a03939093166c01000000000000000000000000026020808501919091526034808501939093528151808503909301835260549093019052805191012090565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b15801561031157600080fd5b505afa158015610325573d6000803e3d6000fd5b505050506040513d602081101561033b57600080fd5b5051610391576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b1580156103ff57600080fd5b505af1158015610413573d6000803e3d6000fd5b505050506040513d602081101561042957600080fd5b505192915050565b606754604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152600160a060020a03858116602483015260448201859052915160009392909216916323b872dd9160648082019260209290919082900301818787803b1580156104a957600080fd5b505af11580156104bd573d6000803e3d6000fd5b505050506040513d60208110156104d357600080fd5b5051610529576040805160e560020a62461bcd02815260206004820152601860248201527f436f756c64206e6f74207472616e7366657220746f6b656e0000000000000000604482015290519081900360640190fd5b600061053e856105398686610262565b61088a565b9050600061054d8260026108e8565b60408051848152602081018790528151929350600160a060020a0388169289927f30489630ef1e35cf4efeec045e3f1a7523e4eb5032d43970c86c5e375361aa30928290030190a395945050505050565b6105a6610615565b6105af57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff168061063f575061063f610998565b8061064d575060005460ff16155b61068b5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff161580156106b6576000805460ff1961ff0019909116610100171660011790555b600160a060020a038216158015906106d65750600160a060020a03831615155b61072a576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b61073384610788565b60668054600160a060020a0380861673ffffffffffffffffffffffffffffffffffffffff199283161790925560678054928516929091169190911790558015610782576000805461ff00191690555b50505050565b600054610100900460ff16806107a157506107a1610998565b806107af575060005460ff16155b6107ed5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff16158015610818576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610886576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b6108d3610615565b6108dc57600080fd5b6108e58161099e565b50565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e4691869186919060240182600381111561093f57fe5b60ff16815260200192505050602060405180830381600087803b15801561096557600080fd5b505af1158015610979573d6000803e3d6000fd5b505050506040513d602081101561098f57600080fd5b50519392505050565b303b1590565b600160a060020a0381166109b157600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820c8df4fc4f5e872036d3745f0160b54c6e23f5fc8ce922ac592293b1db64dfcdf0029",
-  "address": "0xD41161D8f2CE5Ec95465F4b2fBD00Cfea186204C",
-  "implementation": "0x73b2DDc8382BDc41D4f14d616F3f9d0353Db66C4",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/LockRewardCondition.nile.json b/artifacts/LockRewardCondition.nile.json
deleted file mode 100644
index 636532e..0000000
--- a/artifacts/LockRewardCondition.nile.json
+++ /dev/null
@@ -1,242 +0,0 @@
-{
-  "name": "LockRewardCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_rewardAddress",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_conditionId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "Fulfilled",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_tokenAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc0c53b8b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_rewardAddress",
-          "type": "address"
-        },
-        {
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0x118f6402"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_rewardAddress",
-          "type": "address"
-        },
-        {
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x2a29ece6"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610a74806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c0100000000000000000000000000000000000000000000000000000000900480638f32d59b116100835780638f32d59b1461019f578063c0c53b8b146101bb578063c4d66de8146101f3578063cb4e57e814610219578063f2fde38b1461023c576100bb565b8063118f6402146100c05780631ce19185146100fe5780632a29ece61461013f578063715018a6146101715780638da5cb5b1461017b575b600080fd5b6100ec600480360360408110156100d657600080fd5b50600160a060020a038135169060200135610262565b60408051918252519081900360200190f35b61011b6004803603602081101561011457600080fd5b50356102ac565b6040518082600381111561012b57fe5b60ff16815260200191505060405180910390f35b61011b6004803603606081101561015557600080fd5b50803590600160a060020a036020820135169060400135610431565b61017961059e565b005b610183610606565b60408051600160a060020a039092168252519081900360200190f35b6101a7610615565b604080519115158252519081900360200190f35b610179600480360360608110156101d157600080fd5b50600160a060020a038135811691602081013582169160409091013516610626565b6101796004803603602081101561020957600080fd5b5035600160a060020a0316610788565b6100ec6004803603604081101561022f57600080fd5b508035906020013561088a565b6101796004803603602081101561025257600080fd5b5035600160a060020a03166108cb565b60408051600160a060020a03939093166c01000000000000000000000000026020808501919091526034808501939093528151808503909301835260549093019052805191012090565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b15801561031157600080fd5b505afa158015610325573d6000803e3d6000fd5b505050506040513d602081101561033b57600080fd5b5051610391576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b1580156103ff57600080fd5b505af1158015610413573d6000803e3d6000fd5b505050506040513d602081101561042957600080fd5b505192915050565b606754604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152600160a060020a03858116602483015260448201859052915160009392909216916323b872dd9160648082019260209290919082900301818787803b1580156104a957600080fd5b505af11580156104bd573d6000803e3d6000fd5b505050506040513d60208110156104d357600080fd5b5051610529576040805160e560020a62461bcd02815260206004820152601860248201527f436f756c64206e6f74207472616e7366657220746f6b656e0000000000000000604482015290519081900360640190fd5b600061053e856105398686610262565b61088a565b9050600061054d8260026108e8565b60408051848152602081018790528151929350600160a060020a0388169289927f30489630ef1e35cf4efeec045e3f1a7523e4eb5032d43970c86c5e375361aa30928290030190a395945050505050565b6105a6610615565b6105af57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff168061063f575061063f610998565b8061064d575060005460ff16155b61068b5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff161580156106b6576000805460ff1961ff0019909116610100171660011790555b600160a060020a038216158015906106d65750600160a060020a03831615155b61072a576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b61073384610788565b60668054600160a060020a0380861673ffffffffffffffffffffffffffffffffffffffff199283161790925560678054928516929091169190911790558015610782576000805461ff00191690555b50505050565b600054610100900460ff16806107a157506107a1610998565b806107af575060005460ff16155b6107ed5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff16158015610818576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610886576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b6108d3610615565b6108dc57600080fd5b6108e58161099e565b50565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e4691869186919060240182600381111561093f57fe5b60ff16815260200192505050602060405180830381600087803b15801561096557600080fd5b505af1158015610979573d6000803e3d6000fd5b505050506040513d602081101561098f57600080fd5b50519392505050565b303b1590565b600160a060020a0381166109b157600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820c8df4fc4f5e872036d3745f0160b54c6e23f5fc8ce922ac592293b1db64dfcdf0029",
-  "address": "0xE30FC30c678437e0e8F78C52dE9db8E2752781a0",
-  "implementation": "0x1455010e7b0A257B0dab929D15D72233EbaD0655",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/LockRewardCondition.pacific.json b/artifacts/LockRewardCondition.pacific.json
deleted file mode 100644
index 3591436..0000000
--- a/artifacts/LockRewardCondition.pacific.json
+++ /dev/null
@@ -1,242 +0,0 @@
-{
-  "name": "LockRewardCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "name": "_rewardAddress",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "_conditionId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "Fulfilled",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        },
-        {
-          "name": "_tokenAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc0c53b8b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_rewardAddress",
-          "type": "address"
-        },
-        {
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0x118f6402"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_rewardAddress",
-          "type": "address"
-        },
-        {
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x2a29ece6"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610a74806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c0100000000000000000000000000000000000000000000000000000000900480638f32d59b116100835780638f32d59b1461019f578063c0c53b8b146101bb578063c4d66de8146101f3578063cb4e57e814610219578063f2fde38b1461023c576100bb565b8063118f6402146100c05780631ce19185146100fe5780632a29ece61461013f578063715018a6146101715780638da5cb5b1461017b575b600080fd5b6100ec600480360360408110156100d657600080fd5b50600160a060020a038135169060200135610262565b60408051918252519081900360200190f35b61011b6004803603602081101561011457600080fd5b50356102ac565b6040518082600381111561012b57fe5b60ff16815260200191505060405180910390f35b61011b6004803603606081101561015557600080fd5b50803590600160a060020a036020820135169060400135610431565b61017961059e565b005b610183610606565b60408051600160a060020a039092168252519081900360200190f35b6101a7610615565b604080519115158252519081900360200190f35b610179600480360360608110156101d157600080fd5b50600160a060020a038135811691602081013582169160409091013516610626565b6101796004803603602081101561020957600080fd5b5035600160a060020a0316610788565b6100ec6004803603604081101561022f57600080fd5b508035906020013561088a565b6101796004803603602081101561025257600080fd5b5035600160a060020a03166108cb565b60408051600160a060020a03939093166c01000000000000000000000000026020808501919091526034808501939093528151808503909301835260549093019052805191012090565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b15801561031157600080fd5b505afa158015610325573d6000803e3d6000fd5b505050506040513d602081101561033b57600080fd5b5051610391576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b1580156103ff57600080fd5b505af1158015610413573d6000803e3d6000fd5b505050506040513d602081101561042957600080fd5b505192915050565b606754604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152600160a060020a03858116602483015260448201859052915160009392909216916323b872dd9160648082019260209290919082900301818787803b1580156104a957600080fd5b505af11580156104bd573d6000803e3d6000fd5b505050506040513d60208110156104d357600080fd5b5051610529576040805160e560020a62461bcd02815260206004820152601860248201527f436f756c64206e6f74207472616e7366657220746f6b656e0000000000000000604482015290519081900360640190fd5b600061053e856105398686610262565b61088a565b9050600061054d8260026108e8565b60408051848152602081018790528151929350600160a060020a0388169289927f30489630ef1e35cf4efeec045e3f1a7523e4eb5032d43970c86c5e375361aa30928290030190a395945050505050565b6105a6610615565b6105af57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff168061063f575061063f610998565b8061064d575060005460ff16155b61068b5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff161580156106b6576000805460ff1961ff0019909116610100171660011790555b600160a060020a038216158015906106d65750600160a060020a03831615155b61072a576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b61073384610788565b60668054600160a060020a0380861673ffffffffffffffffffffffffffffffffffffffff199283161790925560678054928516929091169190911790558015610782576000805461ff00191690555b50505050565b600054610100900460ff16806107a157506107a1610998565b806107af575060005460ff16155b6107ed5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff16158015610818576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610886576000805461ff00191690555b5050565b60408051602080820194909452306c010000000000000000000000000281830152605480820193909352815180820390930183526074019052805191012090565b6108d3610615565b6108dc57600080fd5b6108e58161099e565b50565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e4691869186919060240182600381111561093f57fe5b60ff16815260200192505050602060405180830381600087803b15801561096557600080fd5b505af1158015610979573d6000803e3d6000fd5b505050506040513d602081101561098f57600080fd5b50519392505050565b303b1590565b600160a060020a0381166109b157600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a72305820c8df4fc4f5e872036d3745f0160b54c6e23f5fc8ce922ac592293b1db64dfcdf0029",
-  "address": "0x7bf64DaCc7929A1e5466f7d9E575128abf1875f8",
-  "implementation": "0xfA4c352fAc992AF63c80F62AD60F8c11ECecb772",
-  "version": "v0.10.3"
-}
\ No newline at end of file
diff --git a/artifacts/OceanToken.duero.json b/artifacts/OceanToken.duero.json
deleted file mode 100644
index cd83035..0000000
--- a/artifacts/OceanToken.duero.json
+++ /dev/null
@@ -1,537 +0,0 @@
-{
-  "name": "OceanToken",
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "name",
-      "outputs": [
-        {
-          "name": "",
-          "type": "string"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x06fdde03"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "approve",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x095ea7b3"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "totalSupply",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x18160ddd"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "transferFrom",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x23b872dd"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "decimals",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x313ce567"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "cap",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x355274ea"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "name": "addedValue",
-          "type": "uint256"
-        }
-      ],
-      "name": "increaseAllowance",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x39509351"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "mint",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x40c10f19"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "owner",
-          "type": "address"
-        }
-      ],
-      "name": "balanceOf",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x70a08231"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "symbol",
-      "outputs": [
-        {
-          "name": "",
-          "type": "string"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x95d89b41"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "addMinter",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x983b2d56"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceMinter",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x98650275"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "name": "subtractedValue",
-          "type": "uint256"
-        }
-      ],
-      "name": "decreaseAllowance",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa457c2d7"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "transfer",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa9059cbb"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "isMinter",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xaa271e1a"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "name": "spender",
-          "type": "address"
-        }
-      ],
-      "name": "allowance",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xdd62ed3e"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "MinterAdded",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "MinterRemoved",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Transfer",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Approval",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "name",
-          "type": "string"
-        },
-        {
-          "name": "symbol",
-          "type": "string"
-        },
-        {
-          "name": "decimals",
-          "type": "uint8"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1624f6c6"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_initialMinter",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x485cc955"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "cap",
-          "type": "uint256"
-        },
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xda35a26f"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506114db806100206000396000f3fe608060405234801561001057600080fd5b5060043610610175576000357c0100000000000000000000000000000000000000000000000000000000900480638da5cb5b116100e0578063a9059cbb11610099578063a9059cbb14610523578063aa271e1a1461054f578063c4d66de814610575578063da35a26f1461059b578063dd62ed3e146105c7578063f2fde38b146105f557610175565b80638da5cb5b146104955780638f32d59b146104b957806395d89b41146104c1578063983b2d56146104c957806398650275146104ef578063a457c2d7146104f757610175565b8063355274ea11610132578063355274ea146103d957806339509351146103e157806340c10f191461040d578063485cc9551461043957806370a0823114610467578063715018a61461048d57610175565b806306fdde031461017a578063095ea7b3146101f75780631624f6c61461023757806318160ddd1461036b57806323b872dd14610385578063313ce567146103bb575b600080fd5b61018261061b565b6040805160208082528351818301528351919283929083019185019080838360005b838110156101bc5781810151838201526020016101a4565b50505050905090810190601f1680156101e95780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6102236004803603604081101561020d57600080fd5b50600160a060020a0381351690602001356106b2565b604080519115158252519081900360200190f35b6103696004803603606081101561024d57600080fd5b81019060208101813564010000000081111561026857600080fd5b82018360208201111561027a57600080fd5b8035906020019184600183028401116401000000008311171561029c57600080fd5b91908080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525092959493602081019350359150506401000000008111156102ef57600080fd5b82018360208201111561030157600080fd5b8035906020019184600183028401116401000000008311171561032357600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295505050903560ff16915061072f9050565b005b61037361080e565b60408051918252519081900360200190f35b6102236004803603606081101561039b57600080fd5b50600160a060020a03813581169160208101359091169060400135610814565b6103c36108dd565b6040805160ff9092168252519081900360200190f35b6103736108e6565b610223600480360360408110156103f757600080fd5b50600160a060020a0381351690602001356108ed565b6102236004803603604081101561042357600080fd5b50600160a060020a03813516906020013561099b565b6103696004803603604081101561044f57600080fd5b50600160a060020a03813581169160200135166109c2565b6103736004803603602081101561047d57600080fd5b5035600160a060020a0316610b1e565b610369610b39565b61049d610ba1565b60408051600160a060020a039092168252519081900360200190f35b610223610bb0565b610182610bc1565b610369600480360360208110156104df57600080fd5b5035600160a060020a0316610c22565b610369610c40565b6102236004803603604081101561050d57600080fd5b50600160a060020a038135169060200135610c4b565b6102236004803603604081101561053957600080fd5b50600160a060020a038135169060200135610c94565b6102236004803603602081101561056557600080fd5b5035600160a060020a0316610ca1565b6103696004803603602081101561058b57600080fd5b5035600160a060020a0316610cb4565b610369600480360360408110156105b157600080fd5b5080359060200135600160a060020a0316610d63565b610373600480360360408110156105dd57600080fd5b50600160a060020a0381358116916020013516610e25565b6103696004803603602081101561060b57600080fd5b5035600160a060020a0316610e50565b60668054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156106a75780601f1061067c576101008083540402835291602001916106a7565b820191906000526020600020905b81548152906001019060200180831161068a57829003601f168201915b505050505090505b90565b6000600160a060020a0383166106c757600080fd5b336000818152609c60209081526040808320600160a060020a03881680855290835292819020869055805186815290519293927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b600054610100900460ff16806107485750610748610e6a565b80610756575060005460ff16155b6107945760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff161580156107bf576000805460ff1961ff0019909116610100171660011790555b83516107d29060669060208701906113e9565b5082516107e69060679060208601906113e9565b506068805460ff191660ff84161790558015610808576000805461ff00191690555b50505050565b609d5490565b600160a060020a0383166000908152609c60209081526040808320338452909152812054610848908363ffffffff610e7016565b600160a060020a0385166000908152609c60209081526040808320338452909152902055610877848484610e85565b600160a060020a0384166000818152609c60209081526040808320338085529083529281902054815190815290519293927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060019392505050565b60685460ff1690565b6101355490565b6000600160a060020a03831661090257600080fd5b336000908152609c60209081526040808320600160a060020a0387168452909152902054610936908363ffffffff610f5216565b336000818152609c60209081526040808320600160a060020a0389168085529083529281902085905580519485525191937f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929081900390910190a350600192915050565b60006109a633610ca1565b6109af57600080fd5b6109b98383610f6b565b50600192915050565b600054610100900460ff16806109db57506109db610e6a565b806109e9575060005460ff16155b610a275760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff16158015610a52576000805460ff1961ff0019909116610100171660011790555b63540ae4806000610a7182670de0b6b3a764000063ffffffff610f9c16565b9050610ae96040518060400160405280600a81526020017f4f6365616e546f6b656e000000000000000000000000000000000000000000008152506040518060400160405280600581526020017f4f4345414e000000000000000000000000000000000000000000000000000000815250601261072f565b610af38186610d63565b610afc85610fc3565b610b05846110c4565b50508015610b19576000805461ff00191690555b505050565b600160a060020a03166000908152609b602052604090205490565b610b41610bb0565b610b4a57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b60678054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156106a75780601f1061067c576101008083540402835291602001916106a7565b610c2b33610ca1565b610c3457600080fd5b610c3d816110c4565b50565b610c493361110c565b565b6000600160a060020a038316610c6057600080fd5b336000908152609c60209081526040808320600160a060020a0387168452909152902054610936908363ffffffff610e7016565b60006109b9338484610e85565b600061072960d08363ffffffff61115416565b600054610100900460ff1680610ccd5750610ccd610e6a565b80610cdb575060005460ff16155b610d195760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff16158015610d44576000805460ff1961ff0019909116610100171660011790555b610d4d82611189565b8015610d5f576000805461ff00191690555b5050565b600054610100900460ff1680610d7c5750610d7c610e6a565b80610d8a575060005460ff16155b610dc85760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff16158015610df3576000805460ff1961ff0019909116610100171660011790555b610dfc82610cb4565b60008311610e0957600080fd5b6101358390558015610b19576000805461ff0019169055505050565b600160a060020a039182166000908152609c6020908152604080832093909416825291909152205490565b610e58610bb0565b610e6157600080fd5b610c3d8161122f565b303b1590565b600082821115610e7f57600080fd5b50900390565b600160a060020a038216610e9857600080fd5b600160a060020a0383166000908152609b6020526040902054610ec1908263ffffffff610e7016565b600160a060020a038085166000908152609b60205260408082209390935590841681522054610ef6908263ffffffff610f5216565b600160a060020a038084166000818152609b602090815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600082820183811015610f6457600080fd5b9392505050565b61013554610f8782610f7b61080e565b9063ffffffff610f5216565b1115610f9257600080fd5b610d5f82826112ab565b600082610fab57506000610729565b82820282848281610fb857fe5b0414610f6457600080fd5b600054610100900460ff1680610fdc5750610fdc610e6a565b80610fea575060005460ff16155b6110285760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff16158015611053576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610d5f576000805461ff00191690555050565b6110d560d08263ffffffff61135516565b604051600160a060020a038216907f6ae172837ea30b801fbfcdd4108aa1d5bf8ff775444fd70256b44e6bf3dfc3f690600090a250565b61111d60d08263ffffffff6113a116565b604051600160a060020a038216907fe94479a9f7e1952cc78f2d6baab678adc1b772d936c6583def489e524cb6669290600090a250565b6000600160a060020a03821661116957600080fd5b50600160a060020a03166000908152602091909152604090205460ff1690565b600054610100900460ff16806111a257506111a2610e6a565b806111b0575060005460ff16155b6111ee5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff16158015611219576000805460ff1961ff0019909116610100171660011790555b61122282610ca1565b610d4d57610d4d826110c4565b600160a060020a03811661124257600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b600160a060020a0382166112be57600080fd5b609d546112d1908263ffffffff610f5216565b609d55600160a060020a0382166000908152609b60205260409020546112fd908263ffffffff610f5216565b600160a060020a0383166000818152609b602090815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b600160a060020a03811661136857600080fd5b6113728282611154565b1561137c57600080fd5b600160a060020a0316600090815260209190915260409020805460ff19166001179055565b600160a060020a0381166113b457600080fd5b6113be8282611154565b6113c757600080fd5b600160a060020a0316600090815260209190915260409020805460ff19169055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061142a57805160ff1916838001178555611457565b82800160010185558215611457579182015b8281111561145757825182559160200191906001019061143c565b50611463929150611467565b5090565b6106af91905b80821115611463576000815560010161146d56fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582023fb2815f01704b09ddd0f6887d45ab72ec7e9ad54f8dc392ac4156dc27539ba0029",
-  "address": "0x5e29AcdE5285E24eb7A211d9F4313E5a9Ed07F36",
-  "implementation": "0xd1876Cdea22Ad7be06C3D1793fe828dcbe204E21",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/OceanToken.kovan.json b/artifacts/OceanToken.kovan.json
deleted file mode 100644
index bafde05..0000000
--- a/artifacts/OceanToken.kovan.json
+++ /dev/null
@@ -1,537 +0,0 @@
-{
-  "name": "OceanToken",
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "name",
-      "outputs": [
-        {
-          "name": "",
-          "type": "string"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x06fdde03"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "approve",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x095ea7b3"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "totalSupply",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x18160ddd"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "transferFrom",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x23b872dd"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "decimals",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x313ce567"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "cap",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x355274ea"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "name": "addedValue",
-          "type": "uint256"
-        }
-      ],
-      "name": "increaseAllowance",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x39509351"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "mint",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x40c10f19"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "owner",
-          "type": "address"
-        }
-      ],
-      "name": "balanceOf",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x70a08231"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "symbol",
-      "outputs": [
-        {
-          "name": "",
-          "type": "string"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x95d89b41"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "addMinter",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x983b2d56"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceMinter",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x98650275"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "name": "subtractedValue",
-          "type": "uint256"
-        }
-      ],
-      "name": "decreaseAllowance",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa457c2d7"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "transfer",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa9059cbb"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "isMinter",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xaa271e1a"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "name": "spender",
-          "type": "address"
-        }
-      ],
-      "name": "allowance",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xdd62ed3e"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "MinterAdded",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "MinterRemoved",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Transfer",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Approval",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "name",
-          "type": "string"
-        },
-        {
-          "name": "symbol",
-          "type": "string"
-        },
-        {
-          "name": "decimals",
-          "type": "uint8"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1624f6c6"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_initialMinter",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x485cc955"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "cap",
-          "type": "uint256"
-        },
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xda35a26f"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506114db806100206000396000f3fe608060405234801561001057600080fd5b5060043610610175576000357c0100000000000000000000000000000000000000000000000000000000900480638da5cb5b116100e0578063a9059cbb11610099578063a9059cbb14610523578063aa271e1a1461054f578063c4d66de814610575578063da35a26f1461059b578063dd62ed3e146105c7578063f2fde38b146105f557610175565b80638da5cb5b146104955780638f32d59b146104b957806395d89b41146104c1578063983b2d56146104c957806398650275146104ef578063a457c2d7146104f757610175565b8063355274ea11610132578063355274ea146103d957806339509351146103e157806340c10f191461040d578063485cc9551461043957806370a0823114610467578063715018a61461048d57610175565b806306fdde031461017a578063095ea7b3146101f75780631624f6c61461023757806318160ddd1461036b57806323b872dd14610385578063313ce567146103bb575b600080fd5b61018261061b565b6040805160208082528351818301528351919283929083019185019080838360005b838110156101bc5781810151838201526020016101a4565b50505050905090810190601f1680156101e95780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6102236004803603604081101561020d57600080fd5b50600160a060020a0381351690602001356106b2565b604080519115158252519081900360200190f35b6103696004803603606081101561024d57600080fd5b81019060208101813564010000000081111561026857600080fd5b82018360208201111561027a57600080fd5b8035906020019184600183028401116401000000008311171561029c57600080fd5b91908080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525092959493602081019350359150506401000000008111156102ef57600080fd5b82018360208201111561030157600080fd5b8035906020019184600183028401116401000000008311171561032357600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295505050903560ff16915061072f9050565b005b61037361080e565b60408051918252519081900360200190f35b6102236004803603606081101561039b57600080fd5b50600160a060020a03813581169160208101359091169060400135610814565b6103c36108dd565b6040805160ff9092168252519081900360200190f35b6103736108e6565b610223600480360360408110156103f757600080fd5b50600160a060020a0381351690602001356108ed565b6102236004803603604081101561042357600080fd5b50600160a060020a03813516906020013561099b565b6103696004803603604081101561044f57600080fd5b50600160a060020a03813581169160200135166109c2565b6103736004803603602081101561047d57600080fd5b5035600160a060020a0316610b1e565b610369610b39565b61049d610ba1565b60408051600160a060020a039092168252519081900360200190f35b610223610bb0565b610182610bc1565b610369600480360360208110156104df57600080fd5b5035600160a060020a0316610c22565b610369610c40565b6102236004803603604081101561050d57600080fd5b50600160a060020a038135169060200135610c4b565b6102236004803603604081101561053957600080fd5b50600160a060020a038135169060200135610c94565b6102236004803603602081101561056557600080fd5b5035600160a060020a0316610ca1565b6103696004803603602081101561058b57600080fd5b5035600160a060020a0316610cb4565b610369600480360360408110156105b157600080fd5b5080359060200135600160a060020a0316610d63565b610373600480360360408110156105dd57600080fd5b50600160a060020a0381358116916020013516610e25565b6103696004803603602081101561060b57600080fd5b5035600160a060020a0316610e50565b60668054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156106a75780601f1061067c576101008083540402835291602001916106a7565b820191906000526020600020905b81548152906001019060200180831161068a57829003601f168201915b505050505090505b90565b6000600160a060020a0383166106c757600080fd5b336000818152609c60209081526040808320600160a060020a03881680855290835292819020869055805186815290519293927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b600054610100900460ff16806107485750610748610e6a565b80610756575060005460ff16155b6107945760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff161580156107bf576000805460ff1961ff0019909116610100171660011790555b83516107d29060669060208701906113e9565b5082516107e69060679060208601906113e9565b506068805460ff191660ff84161790558015610808576000805461ff00191690555b50505050565b609d5490565b600160a060020a0383166000908152609c60209081526040808320338452909152812054610848908363ffffffff610e7016565b600160a060020a0385166000908152609c60209081526040808320338452909152902055610877848484610e85565b600160a060020a0384166000818152609c60209081526040808320338085529083529281902054815190815290519293927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060019392505050565b60685460ff1690565b6101355490565b6000600160a060020a03831661090257600080fd5b336000908152609c60209081526040808320600160a060020a0387168452909152902054610936908363ffffffff610f5216565b336000818152609c60209081526040808320600160a060020a0389168085529083529281902085905580519485525191937f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929081900390910190a350600192915050565b60006109a633610ca1565b6109af57600080fd5b6109b98383610f6b565b50600192915050565b600054610100900460ff16806109db57506109db610e6a565b806109e9575060005460ff16155b610a275760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff16158015610a52576000805460ff1961ff0019909116610100171660011790555b63540ae4806000610a7182670de0b6b3a764000063ffffffff610f9c16565b9050610ae96040518060400160405280600a81526020017f4f6365616e546f6b656e000000000000000000000000000000000000000000008152506040518060400160405280600581526020017f4f4345414e000000000000000000000000000000000000000000000000000000815250601261072f565b610af38186610d63565b610afc85610fc3565b610b05846110c4565b50508015610b19576000805461ff00191690555b505050565b600160a060020a03166000908152609b602052604090205490565b610b41610bb0565b610b4a57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b60678054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156106a75780601f1061067c576101008083540402835291602001916106a7565b610c2b33610ca1565b610c3457600080fd5b610c3d816110c4565b50565b610c493361110c565b565b6000600160a060020a038316610c6057600080fd5b336000908152609c60209081526040808320600160a060020a0387168452909152902054610936908363ffffffff610e7016565b60006109b9338484610e85565b600061072960d08363ffffffff61115416565b600054610100900460ff1680610ccd5750610ccd610e6a565b80610cdb575060005460ff16155b610d195760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff16158015610d44576000805460ff1961ff0019909116610100171660011790555b610d4d82611189565b8015610d5f576000805461ff00191690555b5050565b600054610100900460ff1680610d7c5750610d7c610e6a565b80610d8a575060005460ff16155b610dc85760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff16158015610df3576000805460ff1961ff0019909116610100171660011790555b610dfc82610cb4565b60008311610e0957600080fd5b6101358390558015610b19576000805461ff0019169055505050565b600160a060020a039182166000908152609c6020908152604080832093909416825291909152205490565b610e58610bb0565b610e6157600080fd5b610c3d8161122f565b303b1590565b600082821115610e7f57600080fd5b50900390565b600160a060020a038216610e9857600080fd5b600160a060020a0383166000908152609b6020526040902054610ec1908263ffffffff610e7016565b600160a060020a038085166000908152609b60205260408082209390935590841681522054610ef6908263ffffffff610f5216565b600160a060020a038084166000818152609b602090815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600082820183811015610f6457600080fd5b9392505050565b61013554610f8782610f7b61080e565b9063ffffffff610f5216565b1115610f9257600080fd5b610d5f82826112ab565b600082610fab57506000610729565b82820282848281610fb857fe5b0414610f6457600080fd5b600054610100900460ff1680610fdc5750610fdc610e6a565b80610fea575060005460ff16155b6110285760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff16158015611053576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610d5f576000805461ff00191690555050565b6110d560d08263ffffffff61135516565b604051600160a060020a038216907f6ae172837ea30b801fbfcdd4108aa1d5bf8ff775444fd70256b44e6bf3dfc3f690600090a250565b61111d60d08263ffffffff6113a116565b604051600160a060020a038216907fe94479a9f7e1952cc78f2d6baab678adc1b772d936c6583def489e524cb6669290600090a250565b6000600160a060020a03821661116957600080fd5b50600160a060020a03166000908152602091909152604090205460ff1690565b600054610100900460ff16806111a257506111a2610e6a565b806111b0575060005460ff16155b6111ee5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff16158015611219576000805460ff1961ff0019909116610100171660011790555b61122282610ca1565b610d4d57610d4d826110c4565b600160a060020a03811661124257600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b600160a060020a0382166112be57600080fd5b609d546112d1908263ffffffff610f5216565b609d55600160a060020a0382166000908152609b60205260409020546112fd908263ffffffff610f5216565b600160a060020a0383166000818152609b602090815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b600160a060020a03811661136857600080fd5b6113728282611154565b1561137c57600080fd5b600160a060020a0316600090815260209190915260409020805460ff19166001179055565b600160a060020a0381166113b457600080fd5b6113be8282611154565b6113c757600080fd5b600160a060020a0316600090815260209190915260409020805460ff19169055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061142a57805160ff1916838001178555611457565b82800160010185558215611457579182015b8281111561145757825182559160200191906001019061143c565b50611463929150611467565b5090565b6106af91905b80821115611463576000815560010161146d56fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582023fb2815f01704b09ddd0f6887d45ab72ec7e9ad54f8dc392ac4156dc27539ba0029",
-  "address": "0xB57C4D626548eB8AC0B82b086721516493E2908d",
-  "implementation": "0xC702aF592D2C0719F27a488943E7Eac9475FF0B2",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/OceanToken.nile.json b/artifacts/OceanToken.nile.json
deleted file mode 100644
index 3c534ee..0000000
--- a/artifacts/OceanToken.nile.json
+++ /dev/null
@@ -1,537 +0,0 @@
-{
-  "name": "OceanToken",
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "name",
-      "outputs": [
-        {
-          "name": "",
-          "type": "string"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x06fdde03"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "approve",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x095ea7b3"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "totalSupply",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x18160ddd"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "transferFrom",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x23b872dd"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "decimals",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x313ce567"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "cap",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x355274ea"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "name": "addedValue",
-          "type": "uint256"
-        }
-      ],
-      "name": "increaseAllowance",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x39509351"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "mint",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x40c10f19"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "owner",
-          "type": "address"
-        }
-      ],
-      "name": "balanceOf",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x70a08231"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "symbol",
-      "outputs": [
-        {
-          "name": "",
-          "type": "string"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x95d89b41"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "addMinter",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x983b2d56"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceMinter",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x98650275"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "name": "subtractedValue",
-          "type": "uint256"
-        }
-      ],
-      "name": "decreaseAllowance",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa457c2d7"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "transfer",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa9059cbb"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "isMinter",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xaa271e1a"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "name": "spender",
-          "type": "address"
-        }
-      ],
-      "name": "allowance",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xdd62ed3e"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "MinterAdded",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "MinterRemoved",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Transfer",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Approval",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "name",
-          "type": "string"
-        },
-        {
-          "name": "symbol",
-          "type": "string"
-        },
-        {
-          "name": "decimals",
-          "type": "uint8"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1624f6c6"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_initialMinter",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x485cc955"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "cap",
-          "type": "uint256"
-        },
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xda35a26f"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b506114db806100206000396000f3fe608060405234801561001057600080fd5b5060043610610175576000357c0100000000000000000000000000000000000000000000000000000000900480638da5cb5b116100e0578063a9059cbb11610099578063a9059cbb14610523578063aa271e1a1461054f578063c4d66de814610575578063da35a26f1461059b578063dd62ed3e146105c7578063f2fde38b146105f557610175565b80638da5cb5b146104955780638f32d59b146104b957806395d89b41146104c1578063983b2d56146104c957806398650275146104ef578063a457c2d7146104f757610175565b8063355274ea11610132578063355274ea146103d957806339509351146103e157806340c10f191461040d578063485cc9551461043957806370a0823114610467578063715018a61461048d57610175565b806306fdde031461017a578063095ea7b3146101f75780631624f6c61461023757806318160ddd1461036b57806323b872dd14610385578063313ce567146103bb575b600080fd5b61018261061b565b6040805160208082528351818301528351919283929083019185019080838360005b838110156101bc5781810151838201526020016101a4565b50505050905090810190601f1680156101e95780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6102236004803603604081101561020d57600080fd5b50600160a060020a0381351690602001356106b2565b604080519115158252519081900360200190f35b6103696004803603606081101561024d57600080fd5b81019060208101813564010000000081111561026857600080fd5b82018360208201111561027a57600080fd5b8035906020019184600183028401116401000000008311171561029c57600080fd5b91908080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525092959493602081019350359150506401000000008111156102ef57600080fd5b82018360208201111561030157600080fd5b8035906020019184600183028401116401000000008311171561032357600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295505050903560ff16915061072f9050565b005b61037361080e565b60408051918252519081900360200190f35b6102236004803603606081101561039b57600080fd5b50600160a060020a03813581169160208101359091169060400135610814565b6103c36108dd565b6040805160ff9092168252519081900360200190f35b6103736108e6565b610223600480360360408110156103f757600080fd5b50600160a060020a0381351690602001356108ed565b6102236004803603604081101561042357600080fd5b50600160a060020a03813516906020013561099b565b6103696004803603604081101561044f57600080fd5b50600160a060020a03813581169160200135166109c2565b6103736004803603602081101561047d57600080fd5b5035600160a060020a0316610b1e565b610369610b39565b61049d610ba1565b60408051600160a060020a039092168252519081900360200190f35b610223610bb0565b610182610bc1565b610369600480360360208110156104df57600080fd5b5035600160a060020a0316610c22565b610369610c40565b6102236004803603604081101561050d57600080fd5b50600160a060020a038135169060200135610c4b565b6102236004803603604081101561053957600080fd5b50600160a060020a038135169060200135610c94565b6102236004803603602081101561056557600080fd5b5035600160a060020a0316610ca1565b6103696004803603602081101561058b57600080fd5b5035600160a060020a0316610cb4565b610369600480360360408110156105b157600080fd5b5080359060200135600160a060020a0316610d63565b610373600480360360408110156105dd57600080fd5b50600160a060020a0381358116916020013516610e25565b6103696004803603602081101561060b57600080fd5b5035600160a060020a0316610e50565b60668054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156106a75780601f1061067c576101008083540402835291602001916106a7565b820191906000526020600020905b81548152906001019060200180831161068a57829003601f168201915b505050505090505b90565b6000600160a060020a0383166106c757600080fd5b336000818152609c60209081526040808320600160a060020a03881680855290835292819020869055805186815290519293927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b600054610100900460ff16806107485750610748610e6a565b80610756575060005460ff16155b6107945760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff161580156107bf576000805460ff1961ff0019909116610100171660011790555b83516107d29060669060208701906113e9565b5082516107e69060679060208601906113e9565b506068805460ff191660ff84161790558015610808576000805461ff00191690555b50505050565b609d5490565b600160a060020a0383166000908152609c60209081526040808320338452909152812054610848908363ffffffff610e7016565b600160a060020a0385166000908152609c60209081526040808320338452909152902055610877848484610e85565b600160a060020a0384166000818152609c60209081526040808320338085529083529281902054815190815290519293927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060019392505050565b60685460ff1690565b6101355490565b6000600160a060020a03831661090257600080fd5b336000908152609c60209081526040808320600160a060020a0387168452909152902054610936908363ffffffff610f5216565b336000818152609c60209081526040808320600160a060020a0389168085529083529281902085905580519485525191937f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929081900390910190a350600192915050565b60006109a633610ca1565b6109af57600080fd5b6109b98383610f6b565b50600192915050565b600054610100900460ff16806109db57506109db610e6a565b806109e9575060005460ff16155b610a275760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff16158015610a52576000805460ff1961ff0019909116610100171660011790555b63540ae4806000610a7182670de0b6b3a764000063ffffffff610f9c16565b9050610ae96040518060400160405280600a81526020017f4f6365616e546f6b656e000000000000000000000000000000000000000000008152506040518060400160405280600581526020017f4f4345414e000000000000000000000000000000000000000000000000000000815250601261072f565b610af38186610d63565b610afc85610fc3565b610b05846110c4565b50508015610b19576000805461ff00191690555b505050565b600160a060020a03166000908152609b602052604090205490565b610b41610bb0565b610b4a57600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b60678054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156106a75780601f1061067c576101008083540402835291602001916106a7565b610c2b33610ca1565b610c3457600080fd5b610c3d816110c4565b50565b610c493361110c565b565b6000600160a060020a038316610c6057600080fd5b336000908152609c60209081526040808320600160a060020a0387168452909152902054610936908363ffffffff610e7016565b60006109b9338484610e85565b600061072960d08363ffffffff61115416565b600054610100900460ff1680610ccd5750610ccd610e6a565b80610cdb575060005460ff16155b610d195760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff16158015610d44576000805460ff1961ff0019909116610100171660011790555b610d4d82611189565b8015610d5f576000805461ff00191690555b5050565b600054610100900460ff1680610d7c5750610d7c610e6a565b80610d8a575060005460ff16155b610dc85760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff16158015610df3576000805460ff1961ff0019909116610100171660011790555b610dfc82610cb4565b60008311610e0957600080fd5b6101358390558015610b19576000805461ff0019169055505050565b600160a060020a039182166000908152609c6020908152604080832093909416825291909152205490565b610e58610bb0565b610e6157600080fd5b610c3d8161122f565b303b1590565b600082821115610e7f57600080fd5b50900390565b600160a060020a038216610e9857600080fd5b600160a060020a0383166000908152609b6020526040902054610ec1908263ffffffff610e7016565b600160a060020a038085166000908152609b60205260408082209390935590841681522054610ef6908263ffffffff610f5216565b600160a060020a038084166000818152609b602090815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600082820183811015610f6457600080fd5b9392505050565b61013554610f8782610f7b61080e565b9063ffffffff610f5216565b1115610f9257600080fd5b610d5f82826112ab565b600082610fab57506000610729565b82820282848281610fb857fe5b0414610f6457600080fd5b600054610100900460ff1680610fdc5750610fdc610e6a565b80610fea575060005460ff16155b6110285760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff16158015611053576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610d5f576000805461ff00191690555050565b6110d560d08263ffffffff61135516565b604051600160a060020a038216907f6ae172837ea30b801fbfcdd4108aa1d5bf8ff775444fd70256b44e6bf3dfc3f690600090a250565b61111d60d08263ffffffff6113a116565b604051600160a060020a038216907fe94479a9f7e1952cc78f2d6baab678adc1b772d936c6583def489e524cb6669290600090a250565b6000600160a060020a03821661116957600080fd5b50600160a060020a03166000908152602091909152604090205460ff1690565b600054610100900460ff16806111a257506111a2610e6a565b806111b0575060005460ff16155b6111ee5760405160e560020a62461bcd02815260040180806020018281038252602e815260200180611482602e913960400191505060405180910390fd5b600054610100900460ff16158015611219576000805460ff1961ff0019909116610100171660011790555b61122282610ca1565b610d4d57610d4d826110c4565b600160a060020a03811661124257600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b600160a060020a0382166112be57600080fd5b609d546112d1908263ffffffff610f5216565b609d55600160a060020a0382166000908152609b60205260409020546112fd908263ffffffff610f5216565b600160a060020a0383166000818152609b602090815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b600160a060020a03811661136857600080fd5b6113728282611154565b1561137c57600080fd5b600160a060020a0316600090815260209190915260409020805460ff19166001179055565b600160a060020a0381166113b457600080fd5b6113be8282611154565b6113c757600080fd5b600160a060020a0316600090815260209190915260409020805460ff19169055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061142a57805160ff1916838001178555611457565b82800160010185558215611457579182015b8281111561145757825182559160200191906001019061143c565b50611463929150611467565b5090565b6106af91905b80821115611463576000815560010161146d56fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582023fb2815f01704b09ddd0f6887d45ab72ec7e9ad54f8dc392ac4156dc27539ba0029",
-  "address": "0x9861Da395d7da984D5E8C712c2EDE44b41F777Ad",
-  "implementation": "0x9b4423b08c9595137dDC1b8D0b584477abE705ea",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/OceanToken.pacific.json b/artifacts/OceanToken.pacific.json
deleted file mode 100644
index 024fdf1..0000000
--- a/artifacts/OceanToken.pacific.json
+++ /dev/null
@@ -1,603 +0,0 @@
-{
-  "name": "OceanToken",
-  "abi": [
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "mintingFinished",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "name",
-      "outputs": [
-        {
-          "name": "",
-          "type": "string"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_spender",
-          "type": "address"
-        },
-        {
-          "name": "_value",
-          "type": "uint256"
-        }
-      ],
-      "name": "approve",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "totalSupply",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_from",
-          "type": "address"
-        },
-        {
-          "name": "_to",
-          "type": "address"
-        },
-        {
-          "name": "_value",
-          "type": "uint256"
-        }
-      ],
-      "name": "transferFrom",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "decimals",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_to",
-          "type": "address"
-        },
-        {
-          "name": "_amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "mint",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_value",
-          "type": "uint256"
-        }
-      ],
-      "name": "burn",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_spender",
-          "type": "address"
-        },
-        {
-          "name": "_subtractedValue",
-          "type": "uint256"
-        }
-      ],
-      "name": "decreaseApproval",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "balanceOf",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "symbol",
-      "outputs": [
-        {
-          "name": "",
-          "type": "string"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "bridgeContract",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_spender",
-          "type": "address"
-        },
-        {
-          "name": "_addedValue",
-          "type": "uint256"
-        }
-      ],
-      "name": "increaseApproval",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_spender",
-          "type": "address"
-        }
-      ],
-      "name": "allowance",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "name": "_name",
-          "type": "string"
-        },
-        {
-          "name": "_symbol",
-          "type": "string"
-        },
-        {
-          "name": "_decimals",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "constructor"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "ContractFallbackCallFailed",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "Mint",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [],
-      "name": "MintFinished",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipRenounced",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "burner",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Burn",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        },
-        {
-          "indexed": false,
-          "name": "data",
-          "type": "bytes"
-        }
-      ],
-      "name": "Transfer",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Approval",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Transfer",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_bridgeContract",
-          "type": "address"
-        }
-      ],
-      "name": "setBridgeContract",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_to",
-          "type": "address"
-        },
-        {
-          "name": "_value",
-          "type": "uint256"
-        },
-        {
-          "name": "_data",
-          "type": "bytes"
-        }
-      ],
-      "name": "transferAndCall",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getTokenInterfacesVersion",
-      "outputs": [
-        {
-          "name": "major",
-          "type": "uint64"
-        },
-        {
-          "name": "minor",
-          "type": "uint64"
-        },
-        {
-          "name": "patch",
-          "type": "uint64"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_to",
-          "type": "address"
-        },
-        {
-          "name": "_value",
-          "type": "uint256"
-        }
-      ],
-      "name": "transfer",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "finishMinting",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_token",
-          "type": "address"
-        },
-        {
-          "name": "_to",
-          "type": "address"
-        }
-      ],
-      "name": "claimTokens",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x60806040526006805460a060020a60ff02191690553480156200002157600080fd5b5060405162001496380380620014968339810160409081528151602080840151928401519184018051909493909301928491849184916200006891600091860190620000b2565b5081516200007e906001906020850190620000b2565b506002805460ff90921660ff19909216919091179055505060068054600160a060020a031916331790555062000157915050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10620000f557805160ff191683800117855562000125565b8280016001018555821562000125579182015b828111156200012557825182559160200191906001019062000108565b506200013392915062000137565b5090565b6200015491905b808211156200013357600081556001016200013e565b90565b61132f80620001676000396000f3006080604052600436106101325763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166305d2035b811461013757806306fdde0314610160578063095ea7b3146101ea5780630b26cf661461020e57806318160ddd1461023157806323b872dd14610258578063313ce567146102825780634000aea0146102ad57806340c10f19146102de57806342966c6814610302578063661884631461031a57806369ffa08a1461033e57806370a0823114610365578063715018a6146103865780637d64bcb41461039b578063859ba28c146103b05780638da5cb5b146103f157806395d89b4114610422578063a9059cbb14610437578063cd5965831461045b578063d73dd62314610470578063dd62ed3e14610494578063f2fde38b146104bb575b600080fd5b34801561014357600080fd5b5061014c6104dc565b604080519115158252519081900360200190f35b34801561016c57600080fd5b506101756104fd565b6040805160208082528351818301528351919283929083019185019080838360005b838110156101af578181015183820152602001610197565b50505050905090810190601f1680156101dc5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156101f657600080fd5b5061014c600160a060020a036004351660243561058b565b34801561021a57600080fd5b5061022f600160a060020a03600435166105f1565b005b34801561023d57600080fd5b5061024661065e565b60408051918252519081900360200190f35b34801561026457600080fd5b5061014c600160a060020a0360043581169060243516604435610664565b34801561028e57600080fd5b506102976107cb565b6040805160ff9092168252519081900360200190f35b3480156102b957600080fd5b5061014c60048035600160a060020a03169060248035916044359182019101356107d4565b3480156102ea57600080fd5b5061014c600160a060020a03600435166024356108e4565b34801561030e57600080fd5b5061022f6004356109ef565b34801561032657600080fd5b5061014c600160a060020a03600435166024356109fc565b34801561034a57600080fd5b5061022f600160a060020a0360043581169060243516610aec565b34801561037157600080fd5b50610246600160a060020a0360043516610ca5565b34801561039257600080fd5b5061022f610cc0565b3480156103a757600080fd5b5061014c610cd7565b3480156103bc57600080fd5b506103c5610cde565b6040805167ffffffffffffffff9485168152928416602084015292168183015290519081900360600190f35b3480156103fd57600080fd5b50610406610ce8565b60408051600160a060020a039092168252519081900360200190f35b34801561042e57600080fd5b50610175610cf7565b34801561044357600080fd5b5061014c600160a060020a0360043516602435610d51565b34801561046757600080fd5b50610406610e08565b34801561047c57600080fd5b5061014c600160a060020a0360043516602435610e17565b3480156104a057600080fd5b50610246600160a060020a0360043581169060243516610eb0565b3480156104c757600080fd5b5061022f600160a060020a0360043516610edb565b60065474010000000000000000000000000000000000000000900460ff1681565b6000805460408051602060026001851615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156105835780601f1061055857610100808354040283529160200191610583565b820191906000526020600020905b81548152906001019060200180831161056657829003601f168201915b505050505081565b336000818152600560209081526040808320600160a060020a038716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b600654600160a060020a0316331461060857600080fd5b600160a060020a03811615801590610624575061062481610efb565b151561062f57600080fd5b6007805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b60045490565b6000600160a060020a038316151561067b57600080fd5b600160a060020a0384166000908152600360205260409020548211156106a057600080fd5b600160a060020a03841660009081526005602090815260408083203384529091529020548211156106d057600080fd5b600160a060020a0384166000908152600360205260409020546106f9908363ffffffff610f0316565b600160a060020a03808616600090815260036020526040808220939093559085168152205461072e908363ffffffff610f1516565b600160a060020a038085166000908152600360209081526040808320949094559187168152600582528281203382529091522054610772908363ffffffff610f0316565b600160a060020a03808616600081815260056020908152604080832033845282529182902094909455805186815290519287169391926000805160206112e4833981519152929181900390910190a35060019392505050565b60025460ff1681565b600084600160a060020a038116158015906107f85750600160a060020a0381163014155b151561080357600080fd5b61080d8686610f28565b151561081857600080fd5b85600160a060020a031633600160a060020a03167fe19260aff97b920c7df27010903aeb9c8d2be5d310a2c67824cf3f15396e4c16878787604051808481526020018060200182810382528484828181526020019250808284376040519201829003965090945050505050a361088d86610efb565b156108d8576108cd868686868080601f01602080910402602001604051908101604052809392919081815260200183838082843750610f3b945050505050565b15156108d857600080fd5b50600195945050505050565b600654600090600160a060020a031633146108fe57600080fd5b60065474010000000000000000000000000000000000000000900460ff161561092657600080fd5b600454610939908363ffffffff610f1516565b600455600160a060020a038316600090815260036020526040902054610965908363ffffffff610f1516565b600160a060020a038416600081815260036020908152604091829020939093558051858152905191927f0f6798a560793a54c3bcfe86a93cde1e73087d944c0ea20544137d412139688592918290030190a2604080518381529051600160a060020a038516916000916000805160206112e48339815191529181900360200190a350600192915050565b6109f933826110a5565b50565b336000908152600560209081526040808320600160a060020a038616845290915281205480831115610a5157336000908152600560209081526040808320600160a060020a0388168452909152812055610a86565b610a61818463ffffffff610f0316565b336000908152600560209081526040808320600160a060020a03891684529091529020555b336000818152600560209081526040808320600160a060020a0389168085529083529281902054815190815290519293927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060019392505050565b6006546000908190600160a060020a03163314610b0857600080fd5b600160a060020a0383161515610b1d57600080fd5b600160a060020a0384161515610b6957604051600160a060020a03841690303180156108fc02916000818181858888f19350505050158015610b63573d6000803e3d6000fd5b50610c9f565b604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051859350600160a060020a038416916370a082319160248083019260209291908290030181600087803b158015610bcd57600080fd5b505af1158015610be1573d6000803e3d6000fd5b505050506040513d6020811015610bf757600080fd5b5051604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a0386811660048301526024820184905291519293509084169163a9059cbb916044808201926020929091908290030181600087803b158015610c6857600080fd5b505af1158015610c7c573d6000803e3d6000fd5b505050506040513d6020811015610c9257600080fd5b50511515610c9f57600080fd5b50505050565b600160a060020a031660009081526003602052604090205490565b600654600160a060020a0316331461013257600080fd5b6000806000fd5b6002600080909192565b600654600160a060020a031681565b60018054604080516020600284861615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156105835780601f1061055857610100808354040283529160200191610583565b6000610d5d8383610f28565b1515610d6857600080fd5b610d7183610efb565b8015610d965750604080516000815260208101909152610d949084908490610f3b565b155b15610dff57600754600160a060020a0384811691161415610db657600080fd5b60408051338152600160a060020a038516602082015280820184905290517f11249f0fc79fc134a15a10d1da8291b79515bf987e036ced05b9ec119614070b9181900360600190a15b50600192915050565b600754600160a060020a031681565b336000908152600560209081526040808320600160a060020a0386168452909152812054610e4b908363ffffffff610f1516565b336000818152600560209081526040808320600160a060020a0389168085529083529281902085905580519485525191937f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929081900390910190a350600192915050565b600160a060020a03918216600090815260056020908152604080832093909416825291909152205490565b600654600160a060020a03163314610ef257600080fd5b6109f981611194565b6000903b1190565b600082821115610f0f57fe5b50900390565b81810182811015610f2257fe5b92915050565b6000610f348383611212565b9392505050565b600083600160a060020a03163384846040516024018084600160a060020a0316600160a060020a0316815260200183815260200180602001828103825283818151815260200191508051906020019080838360005b83811015610fa8578181015183820152602001610f90565b50505050905090810190601f168015610fd55780820380516001836020036101000a031916815260200191505b5060408051601f198184030181529181526020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fa4c0ed36000000000000000000000000000000000000000000000000000000001781529051825192975095508594509250905080838360005b8381101561105c578181015183820152602001611044565b50505050905090810190601f1680156110895780820380516001836020036101000a031916815260200191505b509150506000604051808303816000865af19695505050505050565b600160a060020a0382166000908152600360205260409020548111156110ca57600080fd5b600160a060020a0382166000908152600360205260409020546110f3908263ffffffff610f0316565b600160a060020a03831660009081526003602052604090205560045461111f908263ffffffff610f0316565b600455604080518281529051600160a060020a038416917fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5919081900360200190a2604080518281529051600091600160a060020a038516916000805160206112e48339815191529181900360200190a35050565b600160a060020a03811615156111a957600080fd5b600654604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36006805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b6000600160a060020a038316151561122957600080fd5b3360009081526003602052604090205482111561124557600080fd5b33600090815260036020526040902054611265908363ffffffff610f0316565b3360009081526003602052604080822092909255600160a060020a03851681522054611297908363ffffffff610f1516565b600160a060020a0384166000818152600360209081526040918290209390935580518581529051919233926000805160206112e48339815191529281900390910190a3506001929150505600ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa165627a7a72305820319277173495c6b9bb94db8cf039d10ed8b2aa77256adc7ba4a9c97a733e98070029",
-  "address": "0x012578f9381e876A9E2a9111Dfd436FF91A451ae",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/SignCondition.duero.json b/artifacts/SignCondition.duero.json
deleted file mode 100644
index 3a10c62..0000000
--- a/artifacts/SignCondition.duero.json
+++ /dev/null
@@ -1,215 +0,0 @@
-{
-  "name": "SignCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x485cc955"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_message",
-          "type": "bytes32"
-        },
-        {
-          "name": "_publicKey",
-          "type": "address"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xeea0a725"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_message",
-          "type": "bytes32"
-        },
-        {
-          "name": "_publicKey",
-          "type": "address"
-        },
-        {
-          "name": "_signature",
-          "type": "bytes"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xcf897d3d"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610acc806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c010000000000000000000000000000000000000000000000000000000090048063c4d66de811610083578063c4d66de814610179578063cb4e57e81461019f578063cf897d3d146101d4578063eea0a72514610296578063f2fde38b146102c2576100bb565b80631ce19185146100c0578063485cc95514610101578063715018a6146101315780638da5cb5b146101395780638f32d59b1461015d575b600080fd5b6100dd600480360360208110156100d657600080fd5b50356102e8565b604051808260038111156100ed57fe5b60ff16815260200191505060405180910390f35b61012f6004803603604081101561011757600080fd5b50600160a060020a038135811691602001351661046d565b005b61012f6105a3565b61014161060b565b60408051600160a060020a039092168252519081900360200190f35b61016561061a565b604080519115158252519081900360200190f35b61012f6004803603602081101561018f57600080fd5b5035600160a060020a031661062b565b6101c2600480360360408110156101b557600080fd5b508035906020013561072d565b60408051918252519081900360200190f35b6100dd600480360360808110156101ea57600080fd5b813591602081013591600160a060020a03604083013516919081019060808101606082013564010000000081111561022157600080fd5b82018360208201111561023357600080fd5b8035906020019184600183028401116401000000008311171561025557600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610773945050505050565b6101c2600480360360408110156102ac57600080fd5b5080359060200135600160a060020a031661080d565b61012f600480360360208110156102d857600080fd5b5035600160a060020a0316610852565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b15801561034d57600080fd5b505afa158015610361573d6000803e3d6000fd5b505050506040513d602081101561037757600080fd5b50516103cd576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b15801561043b57600080fd5b505af115801561044f573d6000803e3d6000fd5b505050506040513d602081101561046557600080fd5b505192915050565b600054610100900460ff1680610486575061048661086f565b80610494575060005460ff16155b6104d25760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a73602e913960400191505060405180910390fd5b600054610100900460ff161580156104fd576000805460ff1961ff0019909116610100171660011790555b600160a060020a03821661055b576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b6105648361062b565b6066805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a038416179055801561059e576000805461ff00191690555b505050565b6105ab61061a565b6105b457600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff1680610644575061064461086f565b80610652575060005460ff16155b6106905760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a73602e913960400191505060405180910390fd5b600054610100900460ff161580156106bb576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610729576000805461ff00191690555b5050565b6040805160208082018590526c01000000000000000000000000300282840152605480830185905283518084039091018152607490920190925280519101205b92915050565b600082600160a060020a03166107898584610875565b600160a060020a0316146107e7576040805160e560020a62461bcd02815260206004820152601b60248201527f436f756c64206e6f74207265636f766572207369676e61747572650000000000604482015290519081900360640190fd5b6108046107fd866107f8878761080d565b61072d565b6002610946565b95945050505050565b60408051602080820194909452600160a060020a03929092166c0100000000000000000000000002828201528051808303603401815260549092019052805191012090565b61085a61061a565b61086357600080fd5b61086c816109f6565b50565b303b1590565b6000806000808451604114610890576000935050505061076d565b50505060208201516040830151606084015160001a601b8110156108b257601b015b8060ff16601b141580156108ca57508060ff16601c14155b156108db576000935050505061076d565b6040805160008152602080820180845289905260ff8416828401526060820186905260808201859052915160019260a0808401939192601f1981019281900390910190855afa158015610932573d6000803e3d6000fd5b50505060206040510351935050505061076d565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e4691869186919060240182600381111561099d57fe5b60ff16815260200192505050602060405180830381600087803b1580156109c357600080fd5b505af11580156109d7573d6000803e3d6000fd5b505050506040513d60208110156109ed57600080fd5b50519392505050565b600160a060020a038116610a0957600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a723058205b94b76efa4825771af455a538f2b332c2c3f154bd4c596c245248c3272747070029",
-  "address": "0x8c4a2cC4572B6CD68c58BFc220f04CD1143230a0",
-  "implementation": "0xAD3653a10Fbd001D506718912cDA2e9eE56F0601",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/SignCondition.kovan.json b/artifacts/SignCondition.kovan.json
deleted file mode 100644
index 444db10..0000000
--- a/artifacts/SignCondition.kovan.json
+++ /dev/null
@@ -1,215 +0,0 @@
-{
-  "name": "SignCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x485cc955"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_message",
-          "type": "bytes32"
-        },
-        {
-          "name": "_publicKey",
-          "type": "address"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xeea0a725"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_message",
-          "type": "bytes32"
-        },
-        {
-          "name": "_publicKey",
-          "type": "address"
-        },
-        {
-          "name": "_signature",
-          "type": "bytes"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xcf897d3d"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610acc806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c010000000000000000000000000000000000000000000000000000000090048063c4d66de811610083578063c4d66de814610179578063cb4e57e81461019f578063cf897d3d146101d4578063eea0a72514610296578063f2fde38b146102c2576100bb565b80631ce19185146100c0578063485cc95514610101578063715018a6146101315780638da5cb5b146101395780638f32d59b1461015d575b600080fd5b6100dd600480360360208110156100d657600080fd5b50356102e8565b604051808260038111156100ed57fe5b60ff16815260200191505060405180910390f35b61012f6004803603604081101561011757600080fd5b50600160a060020a038135811691602001351661046d565b005b61012f6105a3565b61014161060b565b60408051600160a060020a039092168252519081900360200190f35b61016561061a565b604080519115158252519081900360200190f35b61012f6004803603602081101561018f57600080fd5b5035600160a060020a031661062b565b6101c2600480360360408110156101b557600080fd5b508035906020013561072d565b60408051918252519081900360200190f35b6100dd600480360360808110156101ea57600080fd5b813591602081013591600160a060020a03604083013516919081019060808101606082013564010000000081111561022157600080fd5b82018360208201111561023357600080fd5b8035906020019184600183028401116401000000008311171561025557600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610773945050505050565b6101c2600480360360408110156102ac57600080fd5b5080359060200135600160a060020a031661080d565b61012f600480360360208110156102d857600080fd5b5035600160a060020a0316610852565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b15801561034d57600080fd5b505afa158015610361573d6000803e3d6000fd5b505050506040513d602081101561037757600080fd5b50516103cd576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b15801561043b57600080fd5b505af115801561044f573d6000803e3d6000fd5b505050506040513d602081101561046557600080fd5b505192915050565b600054610100900460ff1680610486575061048661086f565b80610494575060005460ff16155b6104d25760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a73602e913960400191505060405180910390fd5b600054610100900460ff161580156104fd576000805460ff1961ff0019909116610100171660011790555b600160a060020a03821661055b576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b6105648361062b565b6066805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a038416179055801561059e576000805461ff00191690555b505050565b6105ab61061a565b6105b457600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff1680610644575061064461086f565b80610652575060005460ff16155b6106905760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a73602e913960400191505060405180910390fd5b600054610100900460ff161580156106bb576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610729576000805461ff00191690555b5050565b6040805160208082018590526c01000000000000000000000000300282840152605480830185905283518084039091018152607490920190925280519101205b92915050565b600082600160a060020a03166107898584610875565b600160a060020a0316146107e7576040805160e560020a62461bcd02815260206004820152601b60248201527f436f756c64206e6f74207265636f766572207369676e61747572650000000000604482015290519081900360640190fd5b6108046107fd866107f8878761080d565b61072d565b6002610946565b95945050505050565b60408051602080820194909452600160a060020a03929092166c0100000000000000000000000002828201528051808303603401815260549092019052805191012090565b61085a61061a565b61086357600080fd5b61086c816109f6565b50565b303b1590565b6000806000808451604114610890576000935050505061076d565b50505060208201516040830151606084015160001a601b8110156108b257601b015b8060ff16601b141580156108ca57508060ff16601c14155b156108db576000935050505061076d565b6040805160008152602080820180845289905260ff8416828401526060820186905260808201859052915160019260a0808401939192601f1981019281900390910190855afa158015610932573d6000803e3d6000fd5b50505060206040510351935050505061076d565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e4691869186919060240182600381111561099d57fe5b60ff16815260200192505050602060405180830381600087803b1580156109c357600080fd5b505af11580156109d7573d6000803e3d6000fd5b505050506040513d60208110156109ed57600080fd5b50519392505050565b600160a060020a038116610a0957600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a723058205b94b76efa4825771af455a538f2b332c2c3f154bd4c596c245248c3272747070029",
-  "address": "0x7B8B2756de9Ab474ddbCc87047117a2A16419194",
-  "implementation": "0x9591c9B020B261aE839001Abd304Aa81E16c8B55",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/SignCondition.mainnet.json b/artifacts/SignCondition.mainnet.json
deleted file mode 100644
index e32364f..0000000
--- a/artifacts/SignCondition.mainnet.json
+++ /dev/null
@@ -1,215 +0,0 @@
-{
-  "name": "SignCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x485cc955"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_message",
-          "type": "bytes32"
-        },
-        {
-          "name": "_publicKey",
-          "type": "address"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xeea0a725"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_message",
-          "type": "bytes32"
-        },
-        {
-          "name": "_publicKey",
-          "type": "address"
-        },
-        {
-          "name": "_signature",
-          "type": "bytes"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xcf897d3d"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610acc806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c010000000000000000000000000000000000000000000000000000000090048063c4d66de811610083578063c4d66de814610179578063cb4e57e81461019f578063cf897d3d146101d4578063eea0a72514610296578063f2fde38b146102c2576100bb565b80631ce19185146100c0578063485cc95514610101578063715018a6146101315780638da5cb5b146101395780638f32d59b1461015d575b600080fd5b6100dd600480360360208110156100d657600080fd5b50356102e8565b604051808260038111156100ed57fe5b60ff16815260200191505060405180910390f35b61012f6004803603604081101561011757600080fd5b50600160a060020a038135811691602001351661046d565b005b61012f6105a3565b61014161060b565b60408051600160a060020a039092168252519081900360200190f35b61016561061a565b604080519115158252519081900360200190f35b61012f6004803603602081101561018f57600080fd5b5035600160a060020a031661062b565b6101c2600480360360408110156101b557600080fd5b508035906020013561072d565b60408051918252519081900360200190f35b6100dd600480360360808110156101ea57600080fd5b813591602081013591600160a060020a03604083013516919081019060808101606082013564010000000081111561022157600080fd5b82018360208201111561023357600080fd5b8035906020019184600183028401116401000000008311171561025557600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610773945050505050565b6101c2600480360360408110156102ac57600080fd5b5080359060200135600160a060020a031661080d565b61012f600480360360208110156102d857600080fd5b5035600160a060020a0316610852565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b15801561034d57600080fd5b505afa158015610361573d6000803e3d6000fd5b505050506040513d602081101561037757600080fd5b50516103cd576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b15801561043b57600080fd5b505af115801561044f573d6000803e3d6000fd5b505050506040513d602081101561046557600080fd5b505192915050565b600054610100900460ff1680610486575061048661086f565b80610494575060005460ff16155b6104d25760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a73602e913960400191505060405180910390fd5b600054610100900460ff161580156104fd576000805460ff1961ff0019909116610100171660011790555b600160a060020a03821661055b576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b6105648361062b565b6066805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a038416179055801561059e576000805461ff00191690555b505050565b6105ab61061a565b6105b457600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff1680610644575061064461086f565b80610652575060005460ff16155b6106905760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a73602e913960400191505060405180910390fd5b600054610100900460ff161580156106bb576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610729576000805461ff00191690555b5050565b6040805160208082018590526c01000000000000000000000000300282840152605480830185905283518084039091018152607490920190925280519101205b92915050565b600082600160a060020a03166107898584610875565b600160a060020a0316146107e7576040805160e560020a62461bcd02815260206004820152601b60248201527f436f756c64206e6f74207265636f766572207369676e61747572650000000000604482015290519081900360640190fd5b6108046107fd866107f8878761080d565b61072d565b6002610946565b95945050505050565b60408051602080820194909452600160a060020a03929092166c0100000000000000000000000002828201528051808303603401815260549092019052805191012090565b61085a61061a565b61086357600080fd5b61086c816109f6565b50565b303b1590565b6000806000808451604114610890576000935050505061076d565b50505060208201516040830151606084015160001a601b8110156108b257601b015b8060ff16601b141580156108ca57508060ff16601c14155b156108db576000935050505061076d565b6040805160008152602080820180845289905260ff8416828401526060820186905260808201859052915160019260a0808401939192601f1981019281900390910190855afa158015610932573d6000803e3d6000fd5b50505060206040510351935050505061076d565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e4691869186919060240182600381111561099d57fe5b60ff16815260200192505050602060405180830381600087803b1580156109c357600080fd5b505af11580156109d7573d6000803e3d6000fd5b505050506040513d60208110156109ed57600080fd5b50519392505050565b600160a060020a038116610a0957600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a723058205b94b76efa4825771af455a538f2b332c2c3f154bd4c596c245248c3272747070029",
-  "address": "0xEE33DCDBE6aF6197dD01907cfc4296BFC0448B16",
-  "implementation": "0xCcedA1Dac4E4f25dfAEb10C2d3124015b816a27f",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/SignCondition.nile.json b/artifacts/SignCondition.nile.json
deleted file mode 100644
index bc4d7ff..0000000
--- a/artifacts/SignCondition.nile.json
+++ /dev/null
@@ -1,215 +0,0 @@
-{
-  "name": "SignCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x485cc955"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_message",
-          "type": "bytes32"
-        },
-        {
-          "name": "_publicKey",
-          "type": "address"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xeea0a725"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_message",
-          "type": "bytes32"
-        },
-        {
-          "name": "_publicKey",
-          "type": "address"
-        },
-        {
-          "name": "_signature",
-          "type": "bytes"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xcf897d3d"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610acc806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c010000000000000000000000000000000000000000000000000000000090048063c4d66de811610083578063c4d66de814610179578063cb4e57e81461019f578063cf897d3d146101d4578063eea0a72514610296578063f2fde38b146102c2576100bb565b80631ce19185146100c0578063485cc95514610101578063715018a6146101315780638da5cb5b146101395780638f32d59b1461015d575b600080fd5b6100dd600480360360208110156100d657600080fd5b50356102e8565b604051808260038111156100ed57fe5b60ff16815260200191505060405180910390f35b61012f6004803603604081101561011757600080fd5b50600160a060020a038135811691602001351661046d565b005b61012f6105a3565b61014161060b565b60408051600160a060020a039092168252519081900360200190f35b61016561061a565b604080519115158252519081900360200190f35b61012f6004803603602081101561018f57600080fd5b5035600160a060020a031661062b565b6101c2600480360360408110156101b557600080fd5b508035906020013561072d565b60408051918252519081900360200190f35b6100dd600480360360808110156101ea57600080fd5b813591602081013591600160a060020a03604083013516919081019060808101606082013564010000000081111561022157600080fd5b82018360208201111561023357600080fd5b8035906020019184600183028401116401000000008311171561025557600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610773945050505050565b6101c2600480360360408110156102ac57600080fd5b5080359060200135600160a060020a031661080d565b61012f600480360360208110156102d857600080fd5b5035600160a060020a0316610852565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b15801561034d57600080fd5b505afa158015610361573d6000803e3d6000fd5b505050506040513d602081101561037757600080fd5b50516103cd576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b15801561043b57600080fd5b505af115801561044f573d6000803e3d6000fd5b505050506040513d602081101561046557600080fd5b505192915050565b600054610100900460ff1680610486575061048661086f565b80610494575060005460ff16155b6104d25760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a73602e913960400191505060405180910390fd5b600054610100900460ff161580156104fd576000805460ff1961ff0019909116610100171660011790555b600160a060020a03821661055b576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b6105648361062b565b6066805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a038416179055801561059e576000805461ff00191690555b505050565b6105ab61061a565b6105b457600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff1680610644575061064461086f565b80610652575060005460ff16155b6106905760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a73602e913960400191505060405180910390fd5b600054610100900460ff161580156106bb576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610729576000805461ff00191690555b5050565b6040805160208082018590526c01000000000000000000000000300282840152605480830185905283518084039091018152607490920190925280519101205b92915050565b600082600160a060020a03166107898584610875565b600160a060020a0316146107e7576040805160e560020a62461bcd02815260206004820152601b60248201527f436f756c64206e6f74207265636f766572207369676e61747572650000000000604482015290519081900360640190fd5b6108046107fd866107f8878761080d565b61072d565b6002610946565b95945050505050565b60408051602080820194909452600160a060020a03929092166c0100000000000000000000000002828201528051808303603401815260549092019052805191012090565b61085a61061a565b61086357600080fd5b61086c816109f6565b50565b303b1590565b6000806000808451604114610890576000935050505061076d565b50505060208201516040830151606084015160001a601b8110156108b257601b015b8060ff16601b141580156108ca57508060ff16601c14155b156108db576000935050505061076d565b6040805160008152602080820180845289905260ff8416828401526060820186905260808201859052915160019260a0808401939192601f1981019281900390910190855afa158015610932573d6000803e3d6000fd5b50505060206040510351935050505061076d565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e4691869186919060240182600381111561099d57fe5b60ff16815260200192505050602060405180830381600087803b1580156109c357600080fd5b505af11580156109d7573d6000803e3d6000fd5b505050506040513d60208110156109ed57600080fd5b50519392505050565b600160a060020a038116610a0957600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a723058205b94b76efa4825771af455a538f2b332c2c3f154bd4c596c245248c3272747070029",
-  "address": "0x5a4301F8a7a8A13485621b9B4C82B1E66c112ee2",
-  "implementation": "0x72d17e157B3f7E631788aF0476C4C2A0E0FA22eC",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/SignCondition.pacific.json b/artifacts/SignCondition.pacific.json
deleted file mode 100644
index c6b0380..0000000
--- a/artifacts/SignCondition.pacific.json
+++ /dev/null
@@ -1,215 +0,0 @@
-{
-  "name": "SignCondition",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "abortByTimeOut",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x1ce19185"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_valueHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "generateId",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xcb4e57e8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        },
-        {
-          "name": "_conditionStoreManagerAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x485cc955"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "sender",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_message",
-          "type": "bytes32"
-        },
-        {
-          "name": "_publicKey",
-          "type": "address"
-        }
-      ],
-      "name": "hashValues",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "pure",
-      "type": "function",
-      "signature": "0xeea0a725"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_agreementId",
-          "type": "bytes32"
-        },
-        {
-          "name": "_message",
-          "type": "bytes32"
-        },
-        {
-          "name": "_publicKey",
-          "type": "address"
-        },
-        {
-          "name": "_signature",
-          "type": "bytes"
-        }
-      ],
-      "name": "fulfill",
-      "outputs": [
-        {
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xcf897d3d"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610acc806100206000396000f3fe608060405234801561001057600080fd5b50600436106100bb576000357c010000000000000000000000000000000000000000000000000000000090048063c4d66de811610083578063c4d66de814610179578063cb4e57e81461019f578063cf897d3d146101d4578063eea0a72514610296578063f2fde38b146102c2576100bb565b80631ce19185146100c0578063485cc95514610101578063715018a6146101315780638da5cb5b146101395780638f32d59b1461015d575b600080fd5b6100dd600480360360208110156100d657600080fd5b50356102e8565b604051808260038111156100ed57fe5b60ff16815260200191505060405180910390f35b61012f6004803603604081101561011757600080fd5b50600160a060020a038135811691602001351661046d565b005b61012f6105a3565b61014161060b565b60408051600160a060020a039092168252519081900360200190f35b61016561061a565b604080519115158252519081900360200190f35b61012f6004803603602081101561018f57600080fd5b5035600160a060020a031661062b565b6101c2600480360360408110156101b557600080fd5b508035906020013561072d565b60408051918252519081900360200190f35b6100dd600480360360808110156101ea57600080fd5b813591602081013591600160a060020a03604083013516919081019060808101606082013564010000000081111561022157600080fd5b82018360208201111561023357600080fd5b8035906020019184600183028401116401000000008311171561025557600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610773945050505050565b6101c2600480360360408110156102ac57600080fd5b5080359060200135600160a060020a031661080d565b61012f600480360360208110156102d857600080fd5b5035600160a060020a0316610852565b606654604080517f6ed93cc5000000000000000000000000000000000000000000000000000000008152600481018490529051600092600160a060020a031691636ed93cc5916024808301926020929190829003018186803b15801561034d57600080fd5b505afa158015610361573d6000803e3d6000fd5b505050506040513d602081101561037757600080fd5b50516103cd576040805160e560020a62461bcd02815260206004820152601f60248201527f436f6e646974696f6e206e6565647320746f2062652074696d6564206f757400604482015290519081900360640190fd5b606654604080517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101859052600360248201529051600160a060020a03909216916352bc0e46916044808201926020929091908290030181600087803b15801561043b57600080fd5b505af115801561044f573d6000803e3d6000fd5b505050506040513d602081101561046557600080fd5b505192915050565b600054610100900460ff1680610486575061048661086f565b80610494575060005460ff16155b6104d25760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a73602e913960400191505060405180910390fd5b600054610100900460ff161580156104fd576000805460ff1961ff0019909116610100171660011790555b600160a060020a03821661055b576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b6105648361062b565b6066805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a038416179055801561059e576000805461ff00191690555b505050565b6105ab61061a565b6105b457600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b603354600160a060020a031690565b603354600160a060020a0316331490565b600054610100900460ff1680610644575061064461086f565b80610652575060005460ff16155b6106905760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a73602e913960400191505060405180910390fd5b600054610100900460ff161580156106bb576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610729576000805461ff00191690555b5050565b6040805160208082018590526c01000000000000000000000000300282840152605480830185905283518084039091018152607490920190925280519101205b92915050565b600082600160a060020a03166107898584610875565b600160a060020a0316146107e7576040805160e560020a62461bcd02815260206004820152601b60248201527f436f756c64206e6f74207265636f766572207369676e61747572650000000000604482015290519081900360640190fd5b6108046107fd866107f8878761080d565b61072d565b6002610946565b95945050505050565b60408051602080820194909452600160a060020a03929092166c0100000000000000000000000002828201528051808303603401815260549092019052805191012090565b61085a61061a565b61086357600080fd5b61086c816109f6565b50565b303b1590565b6000806000808451604114610890576000935050505061076d565b50505060208201516040830151606084015160001a601b8110156108b257601b015b8060ff16601b141580156108ca57508060ff16601c14155b156108db576000935050505061076d565b6040805160008152602080820180845289905260ff8416828401526060820186905260808201859052915160019260a0808401939192601f1981019281900390910190855afa158015610932573d6000803e3d6000fd5b50505060206040510351935050505061076d565b6066546040517f52bc0e4600000000000000000000000000000000000000000000000000000000815260048101848152600092600160a060020a0316916352bc0e4691869186919060240182600381111561099d57fe5b60ff16815260200192505050602060405180830381600087803b1580156109c357600080fd5b505af11580156109d7573d6000803e3d6000fd5b505050506040513d60208110156109ed57600080fd5b50519392505050565b600160a060020a038116610a0957600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039290921691909117905556fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a723058205b94b76efa4825771af455a538f2b332c2c3f154bd4c596c245248c3272747070029",
-  "address": "0xB74172078ABb029FaD809335d82241371b998708",
-  "implementation": "0x6D2da5Ed6ca30b7A2C200360A51E11dF3FBDA3CF",
-  "version": "v0.10.3"
-}
\ No newline at end of file
diff --git a/artifacts/TemplateStoreManager.duero.json b/artifacts/TemplateStoreManager.duero.json
deleted file mode 100644
index 833de77..0000000
--- a/artifacts/TemplateStoreManager.duero.json
+++ /dev/null
@@ -1,213 +0,0 @@
-{
-  "name": "TemplateStoreManager",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "proposeTemplate",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xfe4b7724"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "approveTemplate",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa79cf51c"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "revokeTemplate",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xdb80bb9a"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "getTemplate",
-      "outputs": [
-        {
-          "name": "state",
-          "type": "uint8"
-        },
-        {
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xf0d6f5d7"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getTemplateListSize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x722e0b0e"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "isTemplateApproved",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xb727a255"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610a74806100206000396000f3fe608060405234801561001057600080fd5b50600436106100c6576000357c010000000000000000000000000000000000000000000000000000000090048063b727a2551161008e578063b727a25514610155578063c4d66de81461017b578063db80bb9a146101a1578063f0d6f5d7146101c7578063f2fde38b1461024a578063fe4b772414610270576100c6565b8063715018a6146100cb578063722e0b0e146100d55780638da5cb5b146100ef5780638f32d59b14610113578063a79cf51c1461012f575b600080fd5b6100d3610296565b005b6100dd6102fe565b60408051918252519081900360200190f35b6100f7610304565b60408051600160a060020a039092168252519081900360200190f35b61011b610313565b604080519115158252519081900360200190f35b6100d36004803603602081101561014557600080fd5b5035600160a060020a0316610324565b61011b6004803603602081101561016b57600080fd5b5035600160a060020a0316610349565b6100d36004803603602081101561019157600080fd5b5035600160a060020a031661037b565b6100d3600480360360208110156101b757600080fd5b5035600160a060020a0316610488565b6101ed600480360360208110156101dd57600080fd5b5035600160a060020a031661051f565b604051808560038111156101fd57fe5b60ff16815260200184600160a060020a0316600160a060020a0316815260200183600160a060020a0316600160a060020a0316815260200182815260200194505050505060405180910390f35b6100d36004803603602081101561026057600080fd5b5035600160a060020a031661055b565b6100dd6004803603602081101561028657600080fd5b5035600160a060020a0316610575565b61029e610313565b6102a757600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b60675490565b603354600160a060020a031690565b603354600160a060020a0316331490565b61032c610313565b61033557600080fd5b61034660668263ffffffff61058e16565b50565b60006002600160a060020a03831660009081526066602052604090205460ff16600381111561037457fe5b1492915050565b600054610100900460ff16806103945750610394610679565b806103a2575060005460ff16155b6103e05760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff1615801561040b576000805460ff1961ff0019909116610100171660011790555b600160a060020a038216610469576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b6104728261067f565b8015610484576000805461ff00191690555b5050565b80610491610313565b806104ba5750600160a060020a0381811660009081526066602052604090205461010090041633145b61050e576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420557064617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b61048460668363ffffffff61078016565b600160a060020a0390811660009081526066602052604090208054600182015460029092015460ff821694610100909204841693929092169190565b610563610313565b61056c57600080fd5b61034681610828565b600061058860668363ffffffff6108a416565b92915050565b6001600160a060020a03821660009081526020849052604090205460ff1660038111156105b757fe5b1461060c576040805160e560020a62461bcd02815260206004820152601560248201527f54656d706c617465206e6f742050726f706f7365640000000000000000000000604482015290519081900360640190fd5b600160a060020a038116600090815260208390526040902080546002919060ff19166001835b0217905550600160a060020a031660009081526020919091526040902060018101805473ffffffffffffffffffffffffffffffffffffffff19163317905543600290910155565b303b1590565b600054610100900460ff16806106985750610698610679565b806106a6575060005460ff16155b6106e45760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff1615801561070f576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610484576000805461ff00191690555050565b6002600160a060020a03821660009081526020849052604090205460ff1660038111156107a957fe5b146107fe576040805160e560020a62461bcd02815260206004820152601560248201527f54656d706c617465206e6f7420417070726f7665640000000000000000000000604482015290519081900360640190fd5b600160a060020a038116600090815260208390526040902080546003919060ff1916600183610632565b600160a060020a03811661083b57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b600080600160a060020a03831660009081526020859052604090205460ff1660038111156108ce57fe5b14610923576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b6040805160808101909152806001815233602080830182905260408084019290925243606090930192909252600160a060020a038516600090815291869052902081518154829060ff1916600183600381111561097c57fe5b02179055506020828101518254600160a060020a039182166101000274ffffffffffffffffffffffffffffffffffffffff001990911617835560408401516001808501805492841673ffffffffffffffffffffffffffffffffffffffff19938416179055606090950151600290940193909355958301805493840181556000818152919091209092018054949095169316929092179092555491905056fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582054d0304609bbeebb212e0673489877d881fa53b94325a87c1d0cbf445b455b270029",
-  "address": "0xF454Ec72eCed751ffAD94B11ae7c0323670dd976",
-  "implementation": "0xA698632AC1A125A710E3d303044f9Ff229d792F8",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/TemplateStoreManager.kovan.json b/artifacts/TemplateStoreManager.kovan.json
deleted file mode 100644
index 8ab5d17..0000000
--- a/artifacts/TemplateStoreManager.kovan.json
+++ /dev/null
@@ -1,213 +0,0 @@
-{
-  "name": "TemplateStoreManager",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "proposeTemplate",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xfe4b7724"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "approveTemplate",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa79cf51c"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "revokeTemplate",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xdb80bb9a"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "getTemplate",
-      "outputs": [
-        {
-          "name": "state",
-          "type": "uint8"
-        },
-        {
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xf0d6f5d7"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getTemplateListSize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x722e0b0e"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "isTemplateApproved",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xb727a255"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610a74806100206000396000f3fe608060405234801561001057600080fd5b50600436106100c6576000357c010000000000000000000000000000000000000000000000000000000090048063b727a2551161008e578063b727a25514610155578063c4d66de81461017b578063db80bb9a146101a1578063f0d6f5d7146101c7578063f2fde38b1461024a578063fe4b772414610270576100c6565b8063715018a6146100cb578063722e0b0e146100d55780638da5cb5b146100ef5780638f32d59b14610113578063a79cf51c1461012f575b600080fd5b6100d3610296565b005b6100dd6102fe565b60408051918252519081900360200190f35b6100f7610304565b60408051600160a060020a039092168252519081900360200190f35b61011b610313565b604080519115158252519081900360200190f35b6100d36004803603602081101561014557600080fd5b5035600160a060020a0316610324565b61011b6004803603602081101561016b57600080fd5b5035600160a060020a0316610349565b6100d36004803603602081101561019157600080fd5b5035600160a060020a031661037b565b6100d3600480360360208110156101b757600080fd5b5035600160a060020a0316610488565b6101ed600480360360208110156101dd57600080fd5b5035600160a060020a031661051f565b604051808560038111156101fd57fe5b60ff16815260200184600160a060020a0316600160a060020a0316815260200183600160a060020a0316600160a060020a0316815260200182815260200194505050505060405180910390f35b6100d36004803603602081101561026057600080fd5b5035600160a060020a031661055b565b6100dd6004803603602081101561028657600080fd5b5035600160a060020a0316610575565b61029e610313565b6102a757600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b60675490565b603354600160a060020a031690565b603354600160a060020a0316331490565b61032c610313565b61033557600080fd5b61034660668263ffffffff61058e16565b50565b60006002600160a060020a03831660009081526066602052604090205460ff16600381111561037457fe5b1492915050565b600054610100900460ff16806103945750610394610679565b806103a2575060005460ff16155b6103e05760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff1615801561040b576000805460ff1961ff0019909116610100171660011790555b600160a060020a038216610469576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b6104728261067f565b8015610484576000805461ff00191690555b5050565b80610491610313565b806104ba5750600160a060020a0381811660009081526066602052604090205461010090041633145b61050e576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420557064617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b61048460668363ffffffff61078016565b600160a060020a0390811660009081526066602052604090208054600182015460029092015460ff821694610100909204841693929092169190565b610563610313565b61056c57600080fd5b61034681610828565b600061058860668363ffffffff6108a416565b92915050565b6001600160a060020a03821660009081526020849052604090205460ff1660038111156105b757fe5b1461060c576040805160e560020a62461bcd02815260206004820152601560248201527f54656d706c617465206e6f742050726f706f7365640000000000000000000000604482015290519081900360640190fd5b600160a060020a038116600090815260208390526040902080546002919060ff19166001835b0217905550600160a060020a031660009081526020919091526040902060018101805473ffffffffffffffffffffffffffffffffffffffff19163317905543600290910155565b303b1590565b600054610100900460ff16806106985750610698610679565b806106a6575060005460ff16155b6106e45760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff1615801561070f576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610484576000805461ff00191690555050565b6002600160a060020a03821660009081526020849052604090205460ff1660038111156107a957fe5b146107fe576040805160e560020a62461bcd02815260206004820152601560248201527f54656d706c617465206e6f7420417070726f7665640000000000000000000000604482015290519081900360640190fd5b600160a060020a038116600090815260208390526040902080546003919060ff1916600183610632565b600160a060020a03811661083b57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b600080600160a060020a03831660009081526020859052604090205460ff1660038111156108ce57fe5b14610923576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b6040805160808101909152806001815233602080830182905260408084019290925243606090930192909252600160a060020a038516600090815291869052902081518154829060ff1916600183600381111561097c57fe5b02179055506020828101518254600160a060020a039182166101000274ffffffffffffffffffffffffffffffffffffffff001990911617835560408401516001808501805492841673ffffffffffffffffffffffffffffffffffffffff19938416179055606090950151600290940193909355958301805493840181556000818152919091209092018054949095169316929092179092555491905056fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582054d0304609bbeebb212e0673489877d881fa53b94325a87c1d0cbf445b455b270029",
-  "address": "0xD20307e2620Bb8a60991f43c52b64f981103A829",
-  "implementation": "0x6D88E47127377D84Ec0a6724d105DB9243A4F81F",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/TemplateStoreManager.mainnet.json b/artifacts/TemplateStoreManager.mainnet.json
deleted file mode 100644
index f9e327c..0000000
--- a/artifacts/TemplateStoreManager.mainnet.json
+++ /dev/null
@@ -1,213 +0,0 @@
-{
-  "name": "TemplateStoreManager",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "proposeTemplate",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xfe4b7724"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "approveTemplate",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa79cf51c"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "revokeTemplate",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xdb80bb9a"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "getTemplate",
-      "outputs": [
-        {
-          "name": "state",
-          "type": "uint8"
-        },
-        {
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xf0d6f5d7"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getTemplateListSize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x722e0b0e"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "isTemplateApproved",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xb727a255"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610a74806100206000396000f3fe608060405234801561001057600080fd5b50600436106100c6576000357c010000000000000000000000000000000000000000000000000000000090048063b727a2551161008e578063b727a25514610155578063c4d66de81461017b578063db80bb9a146101a1578063f0d6f5d7146101c7578063f2fde38b1461024a578063fe4b772414610270576100c6565b8063715018a6146100cb578063722e0b0e146100d55780638da5cb5b146100ef5780638f32d59b14610113578063a79cf51c1461012f575b600080fd5b6100d3610296565b005b6100dd6102fe565b60408051918252519081900360200190f35b6100f7610304565b60408051600160a060020a039092168252519081900360200190f35b61011b610313565b604080519115158252519081900360200190f35b6100d36004803603602081101561014557600080fd5b5035600160a060020a0316610324565b61011b6004803603602081101561016b57600080fd5b5035600160a060020a0316610349565b6100d36004803603602081101561019157600080fd5b5035600160a060020a031661037b565b6100d3600480360360208110156101b757600080fd5b5035600160a060020a0316610488565b6101ed600480360360208110156101dd57600080fd5b5035600160a060020a031661051f565b604051808560038111156101fd57fe5b60ff16815260200184600160a060020a0316600160a060020a0316815260200183600160a060020a0316600160a060020a0316815260200182815260200194505050505060405180910390f35b6100d36004803603602081101561026057600080fd5b5035600160a060020a031661055b565b6100dd6004803603602081101561028657600080fd5b5035600160a060020a0316610575565b61029e610313565b6102a757600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b60675490565b603354600160a060020a031690565b603354600160a060020a0316331490565b61032c610313565b61033557600080fd5b61034660668263ffffffff61058e16565b50565b60006002600160a060020a03831660009081526066602052604090205460ff16600381111561037457fe5b1492915050565b600054610100900460ff16806103945750610394610679565b806103a2575060005460ff16155b6103e05760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff1615801561040b576000805460ff1961ff0019909116610100171660011790555b600160a060020a038216610469576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b6104728261067f565b8015610484576000805461ff00191690555b5050565b80610491610313565b806104ba5750600160a060020a0381811660009081526066602052604090205461010090041633145b61050e576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420557064617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b61048460668363ffffffff61078016565b600160a060020a0390811660009081526066602052604090208054600182015460029092015460ff821694610100909204841693929092169190565b610563610313565b61056c57600080fd5b61034681610828565b600061058860668363ffffffff6108a416565b92915050565b6001600160a060020a03821660009081526020849052604090205460ff1660038111156105b757fe5b1461060c576040805160e560020a62461bcd02815260206004820152601560248201527f54656d706c617465206e6f742050726f706f7365640000000000000000000000604482015290519081900360640190fd5b600160a060020a038116600090815260208390526040902080546002919060ff19166001835b0217905550600160a060020a031660009081526020919091526040902060018101805473ffffffffffffffffffffffffffffffffffffffff19163317905543600290910155565b303b1590565b600054610100900460ff16806106985750610698610679565b806106a6575060005460ff16155b6106e45760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff1615801561070f576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610484576000805461ff00191690555050565b6002600160a060020a03821660009081526020849052604090205460ff1660038111156107a957fe5b146107fe576040805160e560020a62461bcd02815260206004820152601560248201527f54656d706c617465206e6f7420417070726f7665640000000000000000000000604482015290519081900360640190fd5b600160a060020a038116600090815260208390526040902080546003919060ff1916600183610632565b600160a060020a03811661083b57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b600080600160a060020a03831660009081526020859052604090205460ff1660038111156108ce57fe5b14610923576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b6040805160808101909152806001815233602080830182905260408084019290925243606090930192909252600160a060020a038516600090815291869052902081518154829060ff1916600183600381111561097c57fe5b02179055506020828101518254600160a060020a039182166101000274ffffffffffffffffffffffffffffffffffffffff001990911617835560408401516001808501805492841673ffffffffffffffffffffffffffffffffffffffff19938416179055606090950151600290940193909355958301805493840181556000818152919091209092018054949095169316929092179092555491905056fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582054d0304609bbeebb212e0673489877d881fa53b94325a87c1d0cbf445b455b270029",
-  "address": "0x04DD5364b12131ae870Ec54bd539b5Cb94B9DC36",
-  "implementation": "0xce3fB4b718f1379180b62A23e5CF8aD6BfbE8193",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/TemplateStoreManager.nile.json b/artifacts/TemplateStoreManager.nile.json
deleted file mode 100644
index 677a652..0000000
--- a/artifacts/TemplateStoreManager.nile.json
+++ /dev/null
@@ -1,213 +0,0 @@
-{
-  "name": "TemplateStoreManager",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "proposeTemplate",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xfe4b7724"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "approveTemplate",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa79cf51c"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "revokeTemplate",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xdb80bb9a"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "getTemplate",
-      "outputs": [
-        {
-          "name": "state",
-          "type": "uint8"
-        },
-        {
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xf0d6f5d7"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getTemplateListSize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x722e0b0e"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "isTemplateApproved",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xb727a255"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610a74806100206000396000f3fe608060405234801561001057600080fd5b50600436106100c6576000357c010000000000000000000000000000000000000000000000000000000090048063b727a2551161008e578063b727a25514610155578063c4d66de81461017b578063db80bb9a146101a1578063f0d6f5d7146101c7578063f2fde38b1461024a578063fe4b772414610270576100c6565b8063715018a6146100cb578063722e0b0e146100d55780638da5cb5b146100ef5780638f32d59b14610113578063a79cf51c1461012f575b600080fd5b6100d3610296565b005b6100dd6102fe565b60408051918252519081900360200190f35b6100f7610304565b60408051600160a060020a039092168252519081900360200190f35b61011b610313565b604080519115158252519081900360200190f35b6100d36004803603602081101561014557600080fd5b5035600160a060020a0316610324565b61011b6004803603602081101561016b57600080fd5b5035600160a060020a0316610349565b6100d36004803603602081101561019157600080fd5b5035600160a060020a031661037b565b6100d3600480360360208110156101b757600080fd5b5035600160a060020a0316610488565b6101ed600480360360208110156101dd57600080fd5b5035600160a060020a031661051f565b604051808560038111156101fd57fe5b60ff16815260200184600160a060020a0316600160a060020a0316815260200183600160a060020a0316600160a060020a0316815260200182815260200194505050505060405180910390f35b6100d36004803603602081101561026057600080fd5b5035600160a060020a031661055b565b6100dd6004803603602081101561028657600080fd5b5035600160a060020a0316610575565b61029e610313565b6102a757600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b60675490565b603354600160a060020a031690565b603354600160a060020a0316331490565b61032c610313565b61033557600080fd5b61034660668263ffffffff61058e16565b50565b60006002600160a060020a03831660009081526066602052604090205460ff16600381111561037457fe5b1492915050565b600054610100900460ff16806103945750610394610679565b806103a2575060005460ff16155b6103e05760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff1615801561040b576000805460ff1961ff0019909116610100171660011790555b600160a060020a038216610469576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b6104728261067f565b8015610484576000805461ff00191690555b5050565b80610491610313565b806104ba5750600160a060020a0381811660009081526066602052604090205461010090041633145b61050e576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420557064617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b61048460668363ffffffff61078016565b600160a060020a0390811660009081526066602052604090208054600182015460029092015460ff821694610100909204841693929092169190565b610563610313565b61056c57600080fd5b61034681610828565b600061058860668363ffffffff6108a416565b92915050565b6001600160a060020a03821660009081526020849052604090205460ff1660038111156105b757fe5b1461060c576040805160e560020a62461bcd02815260206004820152601560248201527f54656d706c617465206e6f742050726f706f7365640000000000000000000000604482015290519081900360640190fd5b600160a060020a038116600090815260208390526040902080546002919060ff19166001835b0217905550600160a060020a031660009081526020919091526040902060018101805473ffffffffffffffffffffffffffffffffffffffff19163317905543600290910155565b303b1590565b600054610100900460ff16806106985750610698610679565b806106a6575060005460ff16155b6106e45760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff1615801561070f576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610484576000805461ff00191690555050565b6002600160a060020a03821660009081526020849052604090205460ff1660038111156107a957fe5b146107fe576040805160e560020a62461bcd02815260206004820152601560248201527f54656d706c617465206e6f7420417070726f7665640000000000000000000000604482015290519081900360640190fd5b600160a060020a038116600090815260208390526040902080546003919060ff1916600183610632565b600160a060020a03811661083b57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b600080600160a060020a03831660009081526020859052604090205460ff1660038111156108ce57fe5b14610923576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b6040805160808101909152806001815233602080830182905260408084019290925243606090930192909252600160a060020a038516600090815291869052902081518154829060ff1916600183600381111561097c57fe5b02179055506020828101518254600160a060020a039182166101000274ffffffffffffffffffffffffffffffffffffffff001990911617835560408401516001808501805492841673ffffffffffffffffffffffffffffffffffffffff19938416179055606090950151600290940193909355958301805493840181556000818152919091209092018054949095169316929092179092555491905056fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582054d0304609bbeebb212e0673489877d881fa53b94325a87c1d0cbf445b455b270029",
-  "address": "0x9768c8ae44f1dc81cAA98F48792aA5730cAd2F73",
-  "implementation": "0x54942C6e2FbD4a11929f17D1F9B2Fb6CabeD927A",
-  "version": "v0.10.3"
-}
diff --git a/artifacts/TemplateStoreManager.pacific.json b/artifacts/TemplateStoreManager.pacific.json
deleted file mode 100644
index def447f..0000000
--- a/artifacts/TemplateStoreManager.pacific.json
+++ /dev/null
@@ -1,213 +0,0 @@
-{
-  "name": "TemplateStoreManager",
-  "abi": [
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0x715018a6"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8da5cb5b"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "isOwner",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x8f32d59b"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xf2fde38b"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_owner",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xc4d66de8"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "proposeTemplate",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xfe4b7724"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "approveTemplate",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xa79cf51c"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "revokeTemplate",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function",
-      "signature": "0xdb80bb9a"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "getTemplate",
-      "outputs": [
-        {
-          "name": "state",
-          "type": "uint8"
-        },
-        {
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "name": "lastUpdatedBy",
-          "type": "address"
-        },
-        {
-          "name": "blockNumberUpdated",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xf0d6f5d7"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "getTemplateListSize",
-      "outputs": [
-        {
-          "name": "size",
-          "type": "uint256"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0x722e0b0e"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "name": "_id",
-          "type": "address"
-        }
-      ],
-      "name": "isTemplateApproved",
-      "outputs": [
-        {
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function",
-      "signature": "0xb727a255"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610a74806100206000396000f3fe608060405234801561001057600080fd5b50600436106100c6576000357c010000000000000000000000000000000000000000000000000000000090048063b727a2551161008e578063b727a25514610155578063c4d66de81461017b578063db80bb9a146101a1578063f0d6f5d7146101c7578063f2fde38b1461024a578063fe4b772414610270576100c6565b8063715018a6146100cb578063722e0b0e146100d55780638da5cb5b146100ef5780638f32d59b14610113578063a79cf51c1461012f575b600080fd5b6100d3610296565b005b6100dd6102fe565b60408051918252519081900360200190f35b6100f7610304565b60408051600160a060020a039092168252519081900360200190f35b61011b610313565b604080519115158252519081900360200190f35b6100d36004803603602081101561014557600080fd5b5035600160a060020a0316610324565b61011b6004803603602081101561016b57600080fd5b5035600160a060020a0316610349565b6100d36004803603602081101561019157600080fd5b5035600160a060020a031661037b565b6100d3600480360360208110156101b757600080fd5b5035600160a060020a0316610488565b6101ed600480360360208110156101dd57600080fd5b5035600160a060020a031661051f565b604051808560038111156101fd57fe5b60ff16815260200184600160a060020a0316600160a060020a0316815260200183600160a060020a0316600160a060020a0316815260200182815260200194505050505060405180910390f35b6100d36004803603602081101561026057600080fd5b5035600160a060020a031661055b565b6100dd6004803603602081101561028657600080fd5b5035600160a060020a0316610575565b61029e610313565b6102a757600080fd5b603354604051600091600160a060020a0316907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a36033805473ffffffffffffffffffffffffffffffffffffffff19169055565b60675490565b603354600160a060020a031690565b603354600160a060020a0316331490565b61032c610313565b61033557600080fd5b61034660668263ffffffff61058e16565b50565b60006002600160a060020a03831660009081526066602052604090205460ff16600381111561037457fe5b1492915050565b600054610100900460ff16806103945750610394610679565b806103a2575060005460ff16155b6103e05760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff1615801561040b576000805460ff1961ff0019909116610100171660011790555b600160a060020a038216610469576040805160e560020a62461bcd02815260206004820152600f60248201527f496e76616c696420616464726573730000000000000000000000000000000000604482015290519081900360640190fd5b6104728261067f565b8015610484576000805461ff00191690555b5050565b80610491610313565b806104ba5750600160a060020a0381811660009081526066602052604090205461010090041633145b61050e576040805160e560020a62461bcd02815260206004820152601260248201527f496e76616c696420557064617465526f6c650000000000000000000000000000604482015290519081900360640190fd5b61048460668363ffffffff61078016565b600160a060020a0390811660009081526066602052604090208054600182015460029092015460ff821694610100909204841693929092169190565b610563610313565b61056c57600080fd5b61034681610828565b600061058860668363ffffffff6108a416565b92915050565b6001600160a060020a03821660009081526020849052604090205460ff1660038111156105b757fe5b1461060c576040805160e560020a62461bcd02815260206004820152601560248201527f54656d706c617465206e6f742050726f706f7365640000000000000000000000604482015290519081900360640190fd5b600160a060020a038116600090815260208390526040902080546002919060ff19166001835b0217905550600160a060020a031660009081526020919091526040902060018101805473ffffffffffffffffffffffffffffffffffffffff19163317905543600290910155565b303b1590565b600054610100900460ff16806106985750610698610679565b806106a6575060005460ff16155b6106e45760405160e560020a62461bcd02815260040180806020018281038252602e815260200180610a1b602e913960400191505060405180910390fd5b600054610100900460ff1615801561070f576000805460ff1961ff0019909116610100171660011790555b6033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384811691909117918290556040519116906000907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a38015610484576000805461ff00191690555050565b6002600160a060020a03821660009081526020849052604090205460ff1660038111156107a957fe5b146107fe576040805160e560020a62461bcd02815260206004820152601560248201527f54656d706c617465206e6f7420417070726f7665640000000000000000000000604482015290519081900360640190fd5b600160a060020a038116600090815260208390526040902080546003919060ff1916600183610632565b600160a060020a03811661083b57600080fd5b603354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36033805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b600080600160a060020a03831660009081526020859052604090205460ff1660038111156108ce57fe5b14610923576040805160e560020a62461bcd02815260206004820152601160248201527f496420616c726561647920657869737473000000000000000000000000000000604482015290519081900360640190fd5b6040805160808101909152806001815233602080830182905260408084019290925243606090930192909252600160a060020a038516600090815291869052902081518154829060ff1916600183600381111561097c57fe5b02179055506020828101518254600160a060020a039182166101000274ffffffffffffffffffffffffffffffffffffffff001990911617835560408401516001808501805492841673ffffffffffffffffffffffffffffffffffffffff19938416179055606090950151600290940193909355958301805493840181556000818152919091209092018054949095169316929092179092555491905056fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a165627a7a7230582054d0304609bbeebb212e0673489877d881fa53b94325a87c1d0cbf445b455b270029",
-  "address": "0xF2Cf3761c166c6D85d07299427821D18A4329cd1",
-  "implementation": "0x7dfdaCE5dD22121dC50e50921Ebef0a9ae0A57b9",
-  "version": "v0.10.3"
-}
\ No newline at end of file
diff --git a/kubernetes/egress.yaml b/kubernetes/egress.yaml
new file mode 100644
index 0000000..b0a7e52
--- /dev/null
+++ b/kubernetes/egress.yaml
@@ -0,0 +1,18 @@
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: deny-metadata-access
+spec:
+  podSelector:
+    matchExpressions:
+      - {key: component, operator: In, values: [algorithm]}
+    matchLabels:
+      component: algorithm
+  policyTypes:
+  - Egress
+  egress:
+  - to:
+    - ipBlock:
+        cidr: 0.0.0.0/0
+        except:
+        - 169.254.169.254/32
\ No newline at end of file
diff --git a/operator_engine/constants.py b/operator_engine/constants.py
index a70243e..cd0d709 100644
--- a/operator_engine/constants.py
+++ b/operator_engine/constants.py
@@ -89,7 +89,7 @@ class OperatorConfig:
     NOTIFY_STOP_URL = getenv('NOTIFY_STOP_URL',None)
     OPERATOR_PRIVATE_KEY = getenv('OPERATOR_PRIVATE_KEY',None)
     NODE_SELECTOR = getenv('NODE_SELECTOR',None)
-    SERVICE_ACCOUNT = getenv('SERVICE_ACCOUNT','db-operator')
+    SERVICE_ACCOUNT = getenv('SERVICE_ACCOUNT','default')
     NODE_SELECTOR = getenv('NODE_SELECTOR',None)
     PULL_SECRET = getenv('PULL_SECRET',None)
     PULL_POLICY = getenv('PULL_POLICY','Always')
diff --git a/operator_engine/templates/algo-job-template.yaml b/operator_engine/templates/algo-job-template.yaml
index 66fee64..98267c9 100644
--- a/operator_engine/templates/algo-job-template.yaml
+++ b/operator_engine/templates/algo-job-template.yaml
@@ -20,9 +20,12 @@ spec:
         name: "workflow-executor"
         resources: {}
         env: []
+        securityContext:
+          allowPrivilegeEscalation: false
       restartPolicy: OnFailure
       schedulerName: default-scheduler
       securityContext: {}
       serviceAccount: db-operator
       serviceAccountName: db-operator
+      automountServiceAccountToken: false
 status: {}
diff --git a/setup.cfg b/setup.cfg
index bbe6ba8..be47061 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.1
+current_version = 1.0.3
 
 [bdist_wheel]
 universal = 1